Browse Source

[feat] 库存查询

按照万材调整:根据新版prd
重写库存查询详情数据库表
新增库存查询实体类
新增库存查询mapper.xml文件
修改仓库出库单和仓库入库单相关的库存查询业务
新增  inquiry_business_type 库存查询业务类型(0采购、1生产、2委外、3退换货、4库存盘点、5开发修改、6销售、7员工服务、8库存报损)
新增  inquiry_order_type 库存查询订单类型(0采购入库单、1生产入库单、2委外入库单、3退换货单、4库存盘点单、5换货入库单、6生产退料单、7开发退料单、8委外退料单、9员工退料单、10员工领料单、11生产领料单、12委外领料单、13开发领料单、14销售出货单、15退换货单、16库存报损单)
新增  inquiry_warehouse_type 库存查询出入库类型(0采购入库、供应商补货、1生产入库、2委外入库、3公司退货入库、4盘盈、5供应商换货、6生产退料、7开发退料、8委外退料、9员工退料
  10员工领料、11生产领料、12委外领料、13开发领料、14销售出库、15公司退货出库、16盘亏、17报损)
dev
liuxiaoxu 3 months ago
parent
commit
2bf66f995e
  1. 378
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiryDetail.java
  2. 16
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java
  3. 15
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java
  4. 36
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
  5. 140
      ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml

378
ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiryDetail.java

@ -1,6 +1,5 @@
package com.ruoyi.warehouse.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -12,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 仓库库存查询详情对象 warehouse_inventory_inquiry_detail
*
* @author 刘晓旭
* @date 2024-06-06
* @date 2024-12-03
*/
public class WarehouseInventoryInquiryDetail extends BaseEntity
{
@ -22,100 +21,41 @@ public class WarehouseInventoryInquiryDetail extends BaseEntity
private Long inventoryInquiryDetailId;
/** 料号 */
@Excel(name = "料号")
private String materialNo;
/** 物料名称 */
private String materialName;
/** 关联单号 */
@Excel(name = "关联单号")
private String correlationCode;
/** 物料类型 */
private String materialType;
/** 库存查询业务类型(0采购、1生产、2委外、3退换货、4库存盘点、5开发修改、6销售、7员工服务、8库存报损) */
@Excel(name = "库存查询业务类型")
private String inquiryBusinessType;
/** 物料图片地址 */
private String materialPhotourl;
/** 库存查询订单类型(0采购入库单、1生产入库单、2委外入库单、3退换货单、4库存盘点单、5换货入库单、6生产退料单、7开发退料单、8委外退料单、9员工退料单、10员工领料单、11生产领料单、12委外领料单、13开发领料单、14销售出货单、15退换货单、16库存报损单) */
@Excel(name = "库存查询订单类型")
private String inquiryOrderType;
/** 物料品牌 */
private String materialBrand;
/** 库存查询出入库类型(0采购入库、供应商补货、1生产入库、2委外入库、3公司退货入库、4盘盈、5供应商换货、6生产退料、7开发退料、8委外退料、9员工退料10员工领料、11生产领料、12委外领料、13开发领料、14销售出库、15公司退货出库、16盘亏、17报损) */
@Excel(name = "库存查询出入库类型")
private String inquiryWarehouseType;
/** 物料单位 */
private String materialUnit;
/** 物料描述 */
private String materialDescribe;
/** 物料加工方式 */
private String materialProcessMethod;
/** 物料型号 */
private String materialModel;
/** 物料规格 */
private String materialSpecification;
/** 物料历史总数量 */
private BigDecimal historicalTotal;
/** 可用库存数 */
private BigDecimal availableStockNum;
/** 物料归属可用库存数 */
private BigDecimal attributionAvailableStockNum;
/** 物料无归属可用库存数 */
private BigDecimal noattributionAvailableStockNum;
/** 物料使用数 */
private BigDecimal useNum;
/** 物料报损数 */
private BigDecimal reportDamageNum;
/** 物料使用状态 */
private String materialUseStatus;
/** 库存归属单号 */
@Excel(name = "库存归属单号")
private String inventoryAttributionCode;
/** 库存使用单号 */
@Excel(name = "库存使用单号")
private String inventoryUseCode;
/** 出货设备ID */
@Excel(name = "出货设备ID")
private String shippingDeviceId;
/** 库存历史时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "库存历史时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "库存历史时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date inventoryHistoricalTime;
/** 库存历史类型 */
@Excel(name = "库存历史类型")
private String inventoryHistoricalType;
/** 库存增减 */
@Excel(name = "库存增减")
/** 库存增减(0减少、1增加) */
@Excel(name = "库存增减(0减少、1增加)")
private String inventoryIncreaseDecrease;
/** 库存历史数量 */
@Excel(name = "库存历史数量")
private BigDecimal inventoryHistoricalNum;
/** 不含税采购总价 */
@Excel(name = "不含税单价")
private BigDecimal purchasePriceExcludingTax;
/** 含税总价 */
@Excel(name = "含税单价")
private BigDecimal purchasePriceIncludesTax;
/** 采购单号 */
@Excel(name = "采购单号")
private String purchaseOrderCode;
/** 供应商ID */
@Excel(name = "供应商ID")
private String supplierCode;
/** 供应商名称 */
@Excel(name = "供应商名称")
private String supplierName;
/** 增减数量 */
@Excel(name = "增减数量")
private Integer increaseDecreaseNum;
public void setInventoryInquiryDetailId(Long inventoryInquiryDetailId)
{
@ -135,167 +75,50 @@ public class WarehouseInventoryInquiryDetail extends BaseEntity
{
return materialNo;
}
public void setMaterialName(String materialName)
{
this.materialName = materialName;
}
public String getMaterialName()
{
return materialName;
}
public void setMaterialType(String materialType)
{
this.materialType = materialType;
}
public String getMaterialType()
{
return materialType;
}
public void setMaterialPhotourl(String materialPhotourl)
{
this.materialPhotourl = materialPhotourl;
}
public String getMaterialPhotourl()
{
return materialPhotourl;
}
public void setMaterialBrand(String materialBrand)
{
this.materialBrand = materialBrand;
}
public String getMaterialBrand()
{
return materialBrand;
}
public void setMaterialUnit(String materialUnit)
{
this.materialUnit = materialUnit;
}
public String getMaterialUnit()
{
return materialUnit;
}
public void setMaterialDescribe(String materialDescribe)
{
this.materialDescribe = materialDescribe;
}
public String getMaterialDescribe()
{
return materialDescribe;
}
public void setMaterialProcessMethod(String materialProcessMethod)
{
this.materialProcessMethod = materialProcessMethod;
}
public String getMaterialProcessMethod()
{
return materialProcessMethod;
}
public void setMaterialModel(String materialModel)
{
this.materialModel = materialModel;
}
public String getMaterialModel()
{
return materialModel;
}
public void setMaterialSpecification(String materialSpecification)
{
this.materialSpecification = materialSpecification;
}
public String getMaterialSpecification()
{
return materialSpecification;
}
public void setHistoricalTotal(BigDecimal historicalTotal)
public void setCorrelationCode(String correlationCode)
{
this.historicalTotal = historicalTotal;
this.correlationCode = correlationCode;
}
public BigDecimal getHistoricalTotal()
public String getCorrelationCode()
{
return historicalTotal;
return correlationCode;
}
public void setAvailableStockNum(BigDecimal availableStockNum)
public void setInquiryBusinessType(String inquiryBusinessType)
{
this.availableStockNum = availableStockNum;
this.inquiryBusinessType = inquiryBusinessType;
}
public BigDecimal getAvailableStockNum()
public String getInquiryBusinessType()
{
return availableStockNum;
return inquiryBusinessType;
}
public void setAttributionAvailableStockNum(BigDecimal attributionAvailableStockNum)
public void setInquiryOrderType(String inquiryOrderType)
{
this.attributionAvailableStockNum = attributionAvailableStockNum;
this.inquiryOrderType = inquiryOrderType;
}
public BigDecimal getAttributionAvailableStockNum()
public String getInquiryOrderType()
{
return attributionAvailableStockNum;
return inquiryOrderType;
}
public void setNoattributionAvailableStockNum(BigDecimal noattributionAvailableStockNum)
public void setInquiryWarehouseType(String inquiryWarehouseType)
{
this.noattributionAvailableStockNum = noattributionAvailableStockNum;
this.inquiryWarehouseType = inquiryWarehouseType;
}
public BigDecimal getNoattributionAvailableStockNum()
public String getInquiryWarehouseType()
{
return noattributionAvailableStockNum;
return inquiryWarehouseType;
}
public void setUseNum(BigDecimal useNum)
public void setShippingDeviceId(String shippingDeviceId)
{
this.useNum = useNum;
this.shippingDeviceId = shippingDeviceId;
}
public BigDecimal getUseNum()
public String getShippingDeviceId()
{
return useNum;
}
public void setReportDamageNum(BigDecimal reportDamageNum)
{
this.reportDamageNum = reportDamageNum;
}
public BigDecimal getReportDamageNum()
{
return reportDamageNum;
}
public void setMaterialUseStatus(String materialUseStatus)
{
this.materialUseStatus = materialUseStatus;
}
public String getMaterialUseStatus()
{
return materialUseStatus;
}
public void setInventoryAttributionCode(String inventoryAttributionCode)
{
this.inventoryAttributionCode = inventoryAttributionCode;
}
public String getInventoryAttributionCode()
{
return inventoryAttributionCode;
}
public void setInventoryUseCode(String inventoryUseCode)
{
this.inventoryUseCode = inventoryUseCode;
}
public String getInventoryUseCode()
{
return inventoryUseCode;
return shippingDeviceId;
}
public void setInventoryHistoricalTime(Date inventoryHistoricalTime)
{
@ -306,15 +129,6 @@ public class WarehouseInventoryInquiryDetail extends BaseEntity
{
return inventoryHistoricalTime;
}
public void setInventoryHistoricalType(String inventoryHistoricalType)
{
this.inventoryHistoricalType = inventoryHistoricalType;
}
public String getInventoryHistoricalType()
{
return inventoryHistoricalType;
}
public void setInventoryIncreaseDecrease(String inventoryIncreaseDecrease)
{
this.inventoryIncreaseDecrease = inventoryIncreaseDecrease;
@ -324,98 +138,34 @@ public class WarehouseInventoryInquiryDetail extends BaseEntity
{
return inventoryIncreaseDecrease;
}
public void setInventoryHistoricalNum(BigDecimal inventoryHistoricalNum)
{
this.inventoryHistoricalNum = inventoryHistoricalNum;
}
public BigDecimal getInventoryHistoricalNum()
{
return inventoryHistoricalNum;
}
public void setPurchasePriceExcludingTax(BigDecimal purchasePriceExcludingTax)
{
this.purchasePriceExcludingTax = purchasePriceExcludingTax;
}
public BigDecimal getPurchasePriceExcludingTax()
{
return purchasePriceExcludingTax;
}
public void setPurchasePriceIncludesTax(BigDecimal purchasePriceIncludesTax)
{
this.purchasePriceIncludesTax = purchasePriceIncludesTax;
}
public BigDecimal getPurchasePriceIncludesTax()
{
return purchasePriceIncludesTax;
}
public void setPurchaseOrderCode(String purchaseOrderCode)
{
this.purchaseOrderCode = purchaseOrderCode;
}
public String getPurchaseOrderCode()
{
return purchaseOrderCode;
}
public void setSupplierCode(String supplierCode)
{
this.supplierCode = supplierCode;
}
public String getSupplierCode()
{
return supplierCode;
}
public void setSupplierName(String supplierName)
public void setIncreaseDecreaseNum(Integer increaseDecreaseNum)
{
this.supplierName = supplierName;
this.increaseDecreaseNum = increaseDecreaseNum;
}
public String getSupplierName()
public Integer getIncreaseDecreaseNum()
{
return supplierName;
return increaseDecreaseNum;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("inventoryInquiryDetailId", getInventoryInquiryDetailId())
.append("materialNo", getMaterialNo())
.append("materialName", getMaterialName())
.append("materialType", getMaterialType())
.append("materialPhotourl", getMaterialPhotourl())
.append("materialBrand", getMaterialBrand())
.append("materialUnit", getMaterialUnit())
.append("materialDescribe", getMaterialDescribe())
.append("materialProcessMethod", getMaterialProcessMethod())
.append("materialModel", getMaterialModel())
.append("materialSpecification", getMaterialSpecification())
.append("historicalTotal", getHistoricalTotal())
.append("availableStockNum", getAvailableStockNum())
.append("attributionAvailableStockNum", getAttributionAvailableStockNum())
.append("noattributionAvailableStockNum", getNoattributionAvailableStockNum())
.append("useNum", getUseNum())
.append("reportDamageNum", getReportDamageNum())
.append("materialUseStatus", getMaterialUseStatus())
.append("inventoryAttributionCode", getInventoryAttributionCode())
.append("inventoryUseCode", getInventoryUseCode())
.append("inventoryHistoricalTime", getInventoryHistoricalTime())
.append("inventoryHistoricalType", getInventoryHistoricalType())
.append("inventoryIncreaseDecrease", getInventoryIncreaseDecrease())
.append("inventoryHistoricalNum", getInventoryHistoricalNum())
.append("purchasePriceExcludingTax", getPurchasePriceExcludingTax())
.append("purchasePriceIncludesTax", getPurchasePriceIncludesTax())
.append("purchaseOrderCode", getPurchaseOrderCode())
.append("supplierCode", getSupplierCode())
.append("supplierName", getSupplierName())
.append("remark", getRemark())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
.append("inventoryInquiryDetailId", getInventoryInquiryDetailId())
.append("materialNo", getMaterialNo())
.append("correlationCode", getCorrelationCode())
.append("inquiryBusinessType", getInquiryBusinessType())
.append("inquiryOrderType", getInquiryOrderType())
.append("inquiryWarehouseType", getInquiryWarehouseType())
.append("shippingDeviceId", getShippingDeviceId())
.append("inventoryHistoricalTime", getInventoryHistoricalTime())
.append("inventoryIncreaseDecrease", getInventoryIncreaseDecrease())
.append("increaseDecreaseNum", getIncreaseDecreaseNum())
.append("remark", getRemark())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

16
ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java

@ -237,7 +237,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
throw new BusinessException("新增库存报损失败,该物料无库存数据");
}
WarehouseInventoryInquiryDetail inquiryDetail = createWarehouseInventoryInquiryDetail(damageChild);
inquiryDetail.setInventoryHistoricalType("9");
// inquiryDetail.setInventoryHistoricalType("9");
int detailInsertResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail);
if(detailInsertResult<=0){
throw new BusinessException("新增库存历史失败!");
@ -257,15 +257,15 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
public WarehouseInventoryInquiryDetail createWarehouseInventoryInquiryDetail(WarehouseInventoryReportDamageChild damageChild){
WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
inquiryDetail.setMaterialNo(damageChild.getMaterialNo());
inquiryDetail.setMaterialName(damageChild.getMaterialName());
inquiryDetail.setMaterialBrand(damageChild.getMaterialBrand());
inquiryDetail.setMaterialPhotourl(damageChild.getMaterialPhotourl());
inquiryDetail.setMaterialDescribe(damageChild.getMaterialDescribe());
inquiryDetail.setMaterialUnit(damageChild.getMaterialUnit());
inquiryDetail.setMaterialType(damageChild.getMaterialType());
// inquiryDetail.setMaterialName(damageChild.getMaterialName());
// inquiryDetail.setMaterialBrand(damageChild.getMaterialBrand());
// inquiryDetail.setMaterialPhotourl(damageChild.getMaterialPhotourl());
// inquiryDetail.setMaterialDescribe(damageChild.getMaterialDescribe());
// inquiryDetail.setMaterialUnit(damageChild.getMaterialUnit());
// inquiryDetail.setMaterialType(damageChild.getMaterialType());
inquiryDetail.setInventoryIncreaseDecrease("0");
BigDecimal decreaseNum = damageChild.getActualScrapQuantity();
inquiryDetail.setAvailableStockNum(decreaseNum);
// inquiryDetail.setAvailableStockNum(decreaseNum);
inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate());
inquiryDetail.setCreateBy(ShiroUtils.getLoginName());
inquiryDetail.setCreateTime(DateUtils.getNowDate());

15
ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java

@ -591,17 +591,12 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
public WarehouseInventoryInquiryDetail createWarehouseInventoryInquiryDetail(WarehouseOutOrderDetail outOrderDetail){
WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
inquiryDetail.setMaterialNo(outOrderDetail.getMaterialNo());
inquiryDetail.setMaterialName(outOrderDetail.getMaterialName());
inquiryDetail.setMaterialBrand(outOrderDetail.getMaterialBrand());
inquiryDetail.setMaterialPhotourl(outOrderDetail.getMaterialPhotourl());
inquiryDetail.setMaterialDescribe(outOrderDetail.getMaterialDescribe());
inquiryDetail.setMaterialUnit(outOrderDetail.getMaterialUnit());
inquiryDetail.setMaterialType(outOrderDetail.getMaterialType());
inquiryDetail.setInventoryIncreaseDecrease("0");
int decreaseNum = outOrderDetail.getActualOutOrderSum();
BigDecimal useNum = BigDecimal.valueOf(decreaseNum);
inquiryDetail.setUseNum(useNum);
inquiryDetail.setAvailableStockNum(useNum);
// inquiryDetail.setUseNum(useNum);
// inquiryDetail.setAvailableStockNum(useNum);
inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate());
inquiryDetail.setCreateBy(ShiroUtils.getLoginName());
inquiryDetail.setCreateTime(DateUtils.getNowDate());
@ -1361,7 +1356,7 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
throw new BusinessException("更新库存查询数据失败");
}
WarehouseInventoryInquiryDetail inquiryDetail = createWarehouseInventoryInquiryDetail(warehouseOutOrderDetail);
inquiryDetail.setInventoryHistoricalType("5");//委外领料
// inquiryDetail.setInventoryHistoricalType("5");//委外领料
int insertInquiryResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail);
if (insertInquiryResult <= 0){
throw new BusinessException("新增库存历史数据失败");
@ -1460,7 +1455,7 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
throw new BusinessException("更新库存查询数据失败");
}
WarehouseInventoryInquiryDetail inquiryDetail = createWarehouseInventoryInquiryDetail(warehouseOutOrderDetail);
inquiryDetail.setInventoryHistoricalType("6");//员工领料
// inquiryDetail.setInventoryHistoricalType("6");//员工领料
int insertInquiryResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail);
if (insertInquiryResult <= 0){
throw new BusinessException("新增库存历史数据失败");

36
ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java

@ -716,7 +716,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
int storageNum = warehouseStorageOrderDetail.getStorageNum();
WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
inquiryDetail = generateInquiryDetailByPurchaseChild(child,storageNum);
inquiryDetail.setInventoryHistoricalType("0");
// inquiryDetail.setInventoryHistoricalType("0");
// if (correlationCode.startsWith("QG")) {
//// 有无归属分类
// }
@ -726,12 +726,12 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
}else if(warehouseStorageType.equals("5")){//新增生产入库库存历史记录
WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
inquiryDetail = createMakeInOrderInquiryDetail(warehouseStorageOrderDetail);
inquiryDetail.setInventoryHistoricalType("1");
// inquiryDetail.setInventoryHistoricalType("1");
inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail);
}else if(warehouseStorageType.equals("4")){//新增委外入库库存历史记录
WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
inquiryDetail = createMakeInOrderInquiryDetail(warehouseStorageOrderDetail);
inquiryDetail.setInventoryHistoricalType("2");
// inquiryDetail.setInventoryHistoricalType("2");
inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail);
}
//查询该物料报损数,更新库存查询报损数
@ -791,12 +791,12 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
public WarehouseInventoryInquiryDetail generateInquiryDetailByPurchaseChild(PurchaseOrderChild child,int storageNum){
WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
inquiryDetail.setMaterialNo(child.getMaterialNo());
inquiryDetail.setMaterialName(child.getMaterialName());
inquiryDetail.setMaterialBrand(child.getMaterialBrand());
inquiryDetail.setMaterialPhotourl(child.getMaterialPhotourl());
inquiryDetail.setMaterialDescribe(child.getMaterialDescribe());
inquiryDetail.setMaterialType(child.getMaterialType());
inquiryDetail.setMaterialUnit(child.getMaterialUnit());
// inquiryDetail.setMaterialName(child.getMaterialName());
// inquiryDetail.setMaterialBrand(child.getMaterialBrand());
// inquiryDetail.setMaterialPhotourl(child.getMaterialPhotourl());
// inquiryDetail.setMaterialDescribe(child.getMaterialDescribe());
// inquiryDetail.setMaterialType(child.getMaterialType());
// inquiryDetail.setMaterialUnit(child.getMaterialUnit());
// inquiryDetail.setInventoryAttributionCode(child.getPurchasePlanCorrelationCode());
// inquiryDetail.setSupplierCode(child.());
// inquiryDetail.setSupplierName(child.getSupplierName());
@ -804,7 +804,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
// inquiryDetail.setPurchaseOrderCode(child.getPurchaseOrderCode());
// 库存归属单号
BigDecimal realStorageNum = BigDecimal.valueOf(storageNum);
inquiryDetail.setAvailableStockNum(realStorageNum);
// inquiryDetail.setAvailableStockNum(realStorageNum);
// inquiryDetail.setPurchasePriceIncludesTax(child.getMaterialRealRmbSum());
// inquiryDetail.setPurchasePriceExcludingTax(child.getMaterialRealNoRmbSum());
inquiryDetail.setInventoryIncreaseDecrease("1");
@ -818,18 +818,18 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
public WarehouseInventoryInquiryDetail createMakeInOrderInquiryDetail(WarehouseStorageOrderDetail warehouseStorageOrderDetail){
WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
inquiryDetail.setMaterialNo(warehouseStorageOrderDetail.getMaterialNo());
inquiryDetail.setMaterialName(warehouseStorageOrderDetail.getMaterialName());
inquiryDetail.setMaterialType(warehouseStorageOrderDetail.getMaterialType());
inquiryDetail.setMaterialPhotourl(warehouseStorageOrderDetail.getMaterialPhotourl());
inquiryDetail.setMaterialUnit(warehouseStorageOrderDetail.getMaterialUnit());
inquiryDetail.setMaterialDescribe(warehouseStorageOrderDetail.getMaterialDescribe());
inquiryDetail.setMaterialBrand(warehouseStorageOrderDetail.getMaterialBrand());
inquiryDetail.setMaterialProcessMethod(warehouseStorageOrderDetail.getMaterialProcessMethod());
// inquiryDetail.setMaterialName(warehouseStorageOrderDetail.getMaterialName());
// inquiryDetail.setMaterialType(warehouseStorageOrderDetail.getMaterialType());
// inquiryDetail.setMaterialPhotourl(warehouseStorageOrderDetail.getMaterialPhotourl());
// inquiryDetail.setMaterialUnit(warehouseStorageOrderDetail.getMaterialUnit());
// inquiryDetail.setMaterialDescribe(warehouseStorageOrderDetail.getMaterialDescribe());
// inquiryDetail.setMaterialBrand(warehouseStorageOrderDetail.getMaterialBrand());
// inquiryDetail.setMaterialProcessMethod(warehouseStorageOrderDetail.getMaterialProcessMethod());
BigDecimal storagenum = BigDecimal.ZERO;
if(warehouseStorageOrderDetail.getStorageNum()!=null){
storagenum = BigDecimal.valueOf(warehouseStorageOrderDetail.getStorageNum());
}
inquiryDetail.setAvailableStockNum(storagenum);
// inquiryDetail.setAvailableStockNum(storagenum);
inquiryDetail.setInventoryIncreaseDecrease("1");
inquiryDetail.setCreateBy(ShiroUtils.getLoginName());
inquiryDetail.setCreateTime(DateUtils.getNowDate());

140
ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml

@ -1,39 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryDetailMapper">
<resultMap type="WarehouseInventoryInquiryDetail" id="WarehouseInventoryInquiryDetailResult">
<result property="inventoryInquiryDetailId" column="inventory_inquiry_detail_id" />
<result property="materialNo" column="material_no" />
<result property="materialName" column="material_name" />
<result property="materialType" column="material_type" />
<result property="materialPhotourl" column="material_photoUrl" />
<result property="materialBrand" column="material_brand" />
<result property="materialUnit" column="material_unit" />
<result property="materialDescribe" column="material_describe" />
<result property="materialProcessMethod" column="material_process_method" />
<result property="materialModel" column="material_model" />
<result property="materialSpecification" column="material_specification" />
<result property="historicalTotal" column="historical_total" />
<result property="availableStockNum" column="available_stock_num" />
<result property="attributionAvailableStockNum" column="attribution_available_stock_num" />
<result property="noattributionAvailableStockNum" column="noattribution_available_stock_num" />
<result property="useNum" column="use_num" />
<result property="reportDamageNum" column="report_damage_num" />
<result property="materialUseStatus" column="material_use_status" />
<result property="inventoryAttributionCode" column="inventory_attribution_code" />
<result property="inventoryUseCode" column="inventory_use_code" />
<result property="correlationCode" column="correlation_code" />
<result property="inquiryBusinessType" column="inquiry_business_type" />
<result property="inquiryOrderType" column="inquiry_order_type" />
<result property="inquiryWarehouseType" column="inquiry_warehouse_type" />
<result property="shippingDeviceId" column="shipping_device_id" />
<result property="inventoryHistoricalTime" column="inventory_historical_time" />
<result property="inventoryHistoricalType" column="inventory_historical_type" />
<result property="inventoryIncreaseDecrease" column="inventory_increase_decrease" />
<result property="inventoryHistoricalNum" column="inventory_historical_num" />
<result property="purchasePriceExcludingTax" column="purchase_price_excluding_tax" />
<result property="purchasePriceIncludesTax" column="purchase_price_includes_tax" />
<result property="purchaseOrderCode" column="purchase_order_code" />
<result property="supplierCode" column="supplier_code" />
<result property="supplierName" column="supplier_name" />
<result property="increaseDecreaseNum" column="increase_decrease_num" />
<result property="remark" column="remark" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
@ -42,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWarehouseInventoryInquiryDetailVo">
select inventory_inquiry_detail_id, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification, historical_total, available_stock_num, attribution_available_stock_num, noattribution_available_stock_num, use_num, report_damage_num, material_use_status, inventory_attribution_code, inventory_use_code, inventory_historical_time, inventory_historical_type, inventory_increase_decrease, inventory_historical_num, purchase_price_excluding_tax, purchase_price_includes_tax, purchase_order_code, supplier_code, supplier_name, remark, create_time, create_by, update_by, update_time from warehouse_inventory_inquiry_detail
select inventory_inquiry_detail_id, material_no, correlation_code, inquiry_business_type, inquiry_order_type, inquiry_warehouse_type, shipping_device_id, inventory_historical_time, inventory_increase_decrease, increase_decrease_num, remark, create_time, create_by, update_by, update_time from warehouse_inventory_inquiry_detail
</sql>
<select id="selectWarehouseInventoryInquiryDetailList" parameterType="WarehouseInventoryInquiryDetail" resultMap="WarehouseInventoryInquiryDetailResult">
@ -56,117 +37,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where inventory_inquiry_detail_id = #{inventoryInquiryDetailId}
</select>
<select id="selectWarehouseInventoryInquiryDetailByMaterialNo" parameterType="String" resultMap="WarehouseInventoryInquiryDetailResult">
<include refid="selectWarehouseInventoryInquiryDetailVo"/>
where material_no = #{materialNo}
</select>
<insert id="insertWarehouseInventoryInquiryDetail" parameterType="WarehouseInventoryInquiryDetail" useGeneratedKeys="true" keyProperty="inventoryInquiryDetailId">
insert into warehouse_inventory_inquiry_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="materialNo != null">material_no,</if>
<if test="materialName != null">material_name,</if>
<if test="materialType != null">material_type,</if>
<if test="materialPhotourl != null">material_photoUrl,</if>
<if test="materialBrand != null">material_brand,</if>
<if test="materialUnit != null">material_unit,</if>
<if test="materialDescribe != null">material_describe,</if>
<if test="materialProcessMethod != null">material_process_method,</if>
<if test="materialModel != null">material_model,</if>
<if test="materialSpecification != null">material_specification,</if>
<if test="historicalTotal != null">historical_total,</if>
<if test="availableStockNum != null">available_stock_num,</if>
<if test="attributionAvailableStockNum != null">attribution_available_stock_num,</if>
<if test="noattributionAvailableStockNum != null">noattribution_available_stock_num,</if>
<if test="useNum != null">use_num,</if>
<if test="reportDamageNum != null">report_damage_num,</if>
<if test="materialUseStatus != null">material_use_status,</if>
<if test="inventoryAttributionCode != null">inventory_attribution_code,</if>
<if test="inventoryUseCode != null">inventory_use_code,</if>
<if test="correlationCode != null">correlation_code,</if>
<if test="inquiryBusinessType != null">inquiry_business_type,</if>
<if test="inquiryOrderType != null">inquiry_order_type,</if>
<if test="inquiryWarehouseType != null">inquiry_warehouse_type,</if>
<if test="shippingDeviceId != null">shipping_device_id,</if>
<if test="inventoryHistoricalTime != null">inventory_historical_time,</if>
<if test="inventoryHistoricalType != null">inventory_historical_type,</if>
<if test="inventoryIncreaseDecrease != null">inventory_increase_decrease,</if>
<if test="inventoryHistoricalNum != null">inventory_historical_num,</if>
<if test="purchasePriceExcludingTax != null">purchase_price_excluding_tax,</if>
<if test="purchasePriceIncludesTax != null">purchase_price_includes_tax,</if>
<if test="purchaseOrderCode != null">purchase_order_code,</if>
<if test="supplierCode != null">supplier_code,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="increaseDecreaseNum != null">increase_decrease_num,</if>
<if test="remark != null">remark,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="materialNo != null">#{materialNo},</if>
<if test="materialName != null">#{materialName},</if>
<if test="materialType != null">#{materialType},</if>
<if test="materialPhotourl != null">#{materialPhotourl},</if>
<if test="materialBrand != null">#{materialBrand},</if>
<if test="materialUnit != null">#{materialUnit},</if>
<if test="materialDescribe != null">#{materialDescribe},</if>
<if test="materialProcessMethod != null">#{materialProcessMethod},</if>
<if test="materialModel != null">#{materialModel},</if>
<if test="materialSpecification != null">#{materialSpecification},</if>
<if test="historicalTotal != null">#{historicalTotal},</if>
<if test="availableStockNum != null">#{availableStockNum},</if>
<if test="attributionAvailableStockNum != null">#{attributionAvailableStockNum},</if>
<if test="noattributionAvailableStockNum != null">#{noattributionAvailableStockNum},</if>
<if test="useNum != null">#{useNum},</if>
<if test="reportDamageNum != null">#{reportDamageNum},</if>
<if test="materialUseStatus != null">#{materialUseStatus},</if>
<if test="inventoryAttributionCode != null">#{inventoryAttributionCode},</if>
<if test="inventoryUseCode != null">#{inventoryUseCode},</if>
<if test="correlationCode != null">#{correlationCode},</if>
<if test="inquiryBusinessType != null">#{inquiryBusinessType},</if>
<if test="inquiryOrderType != null">#{inquiryOrderType},</if>
<if test="inquiryWarehouseType != null">#{inquiryWarehouseType},</if>
<if test="shippingDeviceId != null">#{shippingDeviceId},</if>
<if test="inventoryHistoricalTime != null">#{inventoryHistoricalTime},</if>
<if test="inventoryHistoricalType != null">#{inventoryHistoricalType},</if>
<if test="inventoryIncreaseDecrease != null">#{inventoryIncreaseDecrease},</if>
<if test="inventoryHistoricalNum != null">#{inventoryHistoricalNum},</if>
<if test="purchasePriceExcludingTax != null">#{purchasePriceExcludingTax},</if>
<if test="purchasePriceIncludesTax != null">#{purchasePriceIncludesTax},</if>
<if test="purchaseOrderCode != null">#{purchaseOrderCode},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="increaseDecreaseNum != null">#{increaseDecreaseNum},</if>
<if test="remark != null">#{remark},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</trim>
</insert>
<update id="updateWarehouseInventoryInquiryDetail" parameterType="WarehouseInventoryInquiryDetail">
update warehouse_inventory_inquiry_detail
<trim prefix="SET" suffixOverrides=",">
<if test="materialNo != null">material_no = #{materialNo},</if>
<if test="materialName != null">material_name = #{materialName},</if>
<if test="materialType != null">material_type = #{materialType},</if>
<if test="materialPhotourl != null">material_photoUrl = #{materialPhotourl},</if>
<if test="materialBrand != null">material_brand = #{materialBrand},</if>
<if test="materialUnit != null">material_unit = #{materialUnit},</if>
<if test="materialDescribe != null">material_describe = #{materialDescribe},</if>
<if test="materialProcessMethod != null">material_process_method = #{materialProcessMethod},</if>
<if test="materialModel != null">material_model = #{materialModel},</if>
<if test="materialSpecification != null">material_specification = #{materialSpecification},</if>
<if test="historicalTotal != null">historical_total = #{historicalTotal},</if>
<if test="availableStockNum != null">available_stock_num = #{availableStockNum},</if>
<if test="attributionAvailableStockNum != null">attribution_available_stock_num = #{attributionAvailableStockNum},</if>
<if test="noattributionAvailableStockNum != null">noattribution_available_stock_num = #{noattributionAvailableStockNum},</if>
<if test="useNum != null">use_num = #{useNum},</if>
<if test="reportDamageNum != null">report_damage_num = #{reportDamageNum},</if>
<if test="materialUseStatus != null">material_use_status = #{materialUseStatus},</if>
<if test="inventoryAttributionCode != null">inventory_attribution_code = #{inventoryAttributionCode},</if>
<if test="inventoryUseCode != null">inventory_use_code = #{inventoryUseCode},</if>
<if test="correlationCode != null">correlation_code = #{correlationCode},</if>
<if test="inquiryBusinessType != null">inquiry_business_type = #{inquiryBusinessType},</if>
<if test="inquiryOrderType != null">inquiry_order_type = #{inquiryOrderType},</if>
<if test="inquiryWarehouseType != null">inquiry_warehouse_type = #{inquiryWarehouseType},</if>
<if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</if>
<if test="inventoryHistoricalTime != null">inventory_historical_time = #{inventoryHistoricalTime},</if>
<if test="inventoryHistoricalType != null">inventory_historical_type = #{inventoryHistoricalType},</if>
<if test="inventoryIncreaseDecrease != null">inventory_increase_decrease = #{inventoryIncreaseDecrease},</if>
<if test="inventoryHistoricalNum != null">inventory_historical_num = #{inventoryHistoricalNum},</if>
<if test="purchasePriceExcludingTax != null">purchase_price_excluding_tax = #{purchasePriceExcludingTax},</if>
<if test="purchasePriceIncludesTax != null">purchase_price_includes_tax = #{purchasePriceIncludesTax},</if>
<if test="purchaseOrderCode != null">purchase_order_code = #{purchaseOrderCode},</if>
<if test="supplierCode != null">supplier_code = #{supplierCode},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="increaseDecreaseNum != null">increase_decrease_num = #{increaseDecreaseNum},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>

Loading…
Cancel
Save