root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
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
6032001755
commit
2bf66f995e
5 changed files with 137 additions and 474 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 396
      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. 148
      ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml

396
ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiryDetail.java
View File

@ -1,6 +1,5 @@
package com.ruoyi.warehouse.domain; package com.ruoyi.warehouse.domain;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
@ -10,9 +9,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 仓库库存查询详情对象 warehouse_inventory_inquiry_detail * 仓库库存查询详情对象 warehouse_inventory_inquiry_detail
* *
* @author 刘晓旭 * @author 刘晓旭
* @date 2024-06-06 * @date 2024-12-03
*/ */
public class WarehouseInventoryInquiryDetail extends BaseEntity public class WarehouseInventoryInquiryDetail extends BaseEntity
{ {
@ -22,400 +21,151 @@ public class WarehouseInventoryInquiryDetail extends BaseEntity
private Long inventoryInquiryDetailId; private Long inventoryInquiryDetailId;
/** 料号 */ /** 料号 */
@Excel(name = "料号")
private String materialNo; private String materialNo;
/** 物料名称 */ /** 关联单号 */
private String materialName; @Excel(name = "关联单号")
private String correlationCode;
/** 物料类型 */ /** 库存查询业务类型(0采购、1生产、2委外、3退换货、4库存盘点、5开发修改、6销售、7员工服务、8库存报损) */
private String materialType; @Excel(name = "库存查询业务类型")
private String inquiryBusinessType;
/** 物料图片地址 */ /** 库存查询订单类型(0采购入库单、1生产入库单、2委外入库单、3退换货单、4库存盘点单、5换货入库单、6生产退料单、7开发退料单、8委外退料单、9员工退料单、10员工领料单、11生产领料单、12委外领料单、13开发领料单、14销售出货单、15退换货单、16库存报损单) */
private String materialPhotourl; @Excel(name = "库存查询订单类型")
private String inquiryOrderType;
/** 物料品牌 */ /** 库存查询出入库类型(0采购入库、供应商补货、1生产入库、2委外入库、3公司退货入库、4盘盈、5供应商换货、6生产退料、7开发退料、8委外退料、9员工退料10员工领料、11生产领料、12委外领料、13开发领料、14销售出库、15公司退货出库、16盘亏、17报损) */
private String materialBrand; @Excel(name = "库存查询出入库类型")
private String inquiryWarehouseType;
/** 物料单位 */ /** 出货设备ID */
private String materialUnit; @Excel(name = "出货设备ID")
private String shippingDeviceId;
/** 物料描述 */
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;
/** 库存历史时间 */ /** 库存历史时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "库存历史时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "库存历史时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date inventoryHistoricalTime; private Date inventoryHistoricalTime;
/** 库存历史类型 */ /** 库存增减(0减少、1增加) */
@Excel(name = "库存历史类型") @Excel(name = "库存增减(0减少、1增加)")
private String inventoryHistoricalType;
/** 库存增减 */
@Excel(name = "库存增减")
private String inventoryIncreaseDecrease; private String inventoryIncreaseDecrease;
/** 库存历史数量 */ /** 增减数量 */
@Excel(name = "库存历史数量") @Excel(name = "增减数量")
private BigDecimal inventoryHistoricalNum; private Integer increaseDecreaseNum;
/** 不含税采购总价 */
@Excel(name = "不含税单价")
private BigDecimal purchasePriceExcludingTax;
/** 含税总价 */ public void setInventoryInquiryDetailId(Long inventoryInquiryDetailId)
@Excel(name = "含税单价")
private BigDecimal purchasePriceIncludesTax;
/** 采购单号 */
@Excel(name = "采购单号")
private String purchaseOrderCode;
/** 供应商ID */
@Excel(name = "供应商ID")
private String supplierCode;
/** 供应商名称 */
@Excel(name = "供应商名称")
private String supplierName;
public void setInventoryInquiryDetailId(Long inventoryInquiryDetailId)
{ {
this.inventoryInquiryDetailId = inventoryInquiryDetailId; this.inventoryInquiryDetailId = inventoryInquiryDetailId;
} }
public Long getInventoryInquiryDetailId() public Long getInventoryInquiryDetailId()
{ {
return inventoryInquiryDetailId; return inventoryInquiryDetailId;
} }
public void setMaterialNo(String materialNo) public void setMaterialNo(String materialNo)
{ {
this.materialNo = materialNo; this.materialNo = materialNo;
} }
public String getMaterialNo() public String getMaterialNo()
{ {
return materialNo; return materialNo;
} }
public void setMaterialName(String materialName) public void setCorrelationCode(String correlationCode)
{
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)
{ {
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; return shippingDeviceId;
} }
public void setReportDamageNum(BigDecimal reportDamageNum) public void setInventoryHistoricalTime(Date inventoryHistoricalTime)
{
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;
}
public void setInventoryHistoricalTime(Date inventoryHistoricalTime)
{ {
this.inventoryHistoricalTime = inventoryHistoricalTime; this.inventoryHistoricalTime = inventoryHistoricalTime;
} }
public Date getInventoryHistoricalTime() public Date getInventoryHistoricalTime()
{ {
return inventoryHistoricalTime; return inventoryHistoricalTime;
} }
public void setInventoryHistoricalType(String inventoryHistoricalType) public void setInventoryIncreaseDecrease(String inventoryIncreaseDecrease)
{
this.inventoryHistoricalType = inventoryHistoricalType;
}
public String getInventoryHistoricalType()
{
return inventoryHistoricalType;
}
public void setInventoryIncreaseDecrease(String inventoryIncreaseDecrease)
{ {
this.inventoryIncreaseDecrease = inventoryIncreaseDecrease; this.inventoryIncreaseDecrease = inventoryIncreaseDecrease;
} }
public String getInventoryIncreaseDecrease() public String getInventoryIncreaseDecrease()
{ {
return inventoryIncreaseDecrease; return inventoryIncreaseDecrease;
} }
public void setInventoryHistoricalNum(BigDecimal inventoryHistoricalNum) public void setIncreaseDecreaseNum(Integer increaseDecreaseNum)
{
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)
{ {
this.supplierName = supplierName; this.increaseDecreaseNum = increaseDecreaseNum;
} }
public String getSupplierName() public Integer getIncreaseDecreaseNum()
{ {
return supplierName; return increaseDecreaseNum;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("inventoryInquiryDetailId", getInventoryInquiryDetailId()) .append("inventoryInquiryDetailId", getInventoryInquiryDetailId())
.append("materialNo", getMaterialNo()) .append("materialNo", getMaterialNo())
.append("materialName", getMaterialName()) .append("correlationCode", getCorrelationCode())
.append("materialType", getMaterialType()) .append("inquiryBusinessType", getInquiryBusinessType())
.append("materialPhotourl", getMaterialPhotourl()) .append("inquiryOrderType", getInquiryOrderType())
.append("materialBrand", getMaterialBrand()) .append("inquiryWarehouseType", getInquiryWarehouseType())
.append("materialUnit", getMaterialUnit()) .append("shippingDeviceId", getShippingDeviceId())
.append("materialDescribe", getMaterialDescribe()) .append("inventoryHistoricalTime", getInventoryHistoricalTime())
.append("materialProcessMethod", getMaterialProcessMethod()) .append("inventoryIncreaseDecrease", getInventoryIncreaseDecrease())
.append("materialModel", getMaterialModel()) .append("increaseDecreaseNum", getIncreaseDecreaseNum())
.append("materialSpecification", getMaterialSpecification()) .append("remark", getRemark())
.append("historicalTotal", getHistoricalTotal()) .append("createTime", getCreateTime())
.append("availableStockNum", getAvailableStockNum()) .append("createBy", getCreateBy())
.append("attributionAvailableStockNum", getAttributionAvailableStockNum()) .append("updateBy", getUpdateBy())
.append("noattributionAvailableStockNum", getNoattributionAvailableStockNum()) .append("updateTime", getUpdateTime())
.append("useNum", getUseNum()) .toString();
.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();
} }
} }

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

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

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

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

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

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

148
ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml
View File

@ -1,39 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryDetailMapper"> <mapper namespace="com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryDetailMapper">
<resultMap type="WarehouseInventoryInquiryDetail" id="WarehouseInventoryInquiryDetailResult"> <resultMap type="WarehouseInventoryInquiryDetail" id="WarehouseInventoryInquiryDetailResult">
<result property="inventoryInquiryDetailId" column="inventory_inquiry_detail_id" /> <result property="inventoryInquiryDetailId" column="inventory_inquiry_detail_id" />
<result property="materialNo" column="material_no" /> <result property="materialNo" column="material_no" />
<result property="materialName" column="material_name" /> <result property="correlationCode" column="correlation_code" />
<result property="materialType" column="material_type" /> <result property="inquiryBusinessType" column="inquiry_business_type" />
<result property="materialPhotourl" column="material_photoUrl" /> <result property="inquiryOrderType" column="inquiry_order_type" />
<result property="materialBrand" column="material_brand" /> <result property="inquiryWarehouseType" column="inquiry_warehouse_type" />
<result property="materialUnit" column="material_unit" /> <result property="shippingDeviceId" column="shipping_device_id" />
<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="inventoryHistoricalTime" column="inventory_historical_time" /> <result property="inventoryHistoricalTime" column="inventory_historical_time" />
<result property="inventoryHistoricalType" column="inventory_historical_type" />
<result property="inventoryIncreaseDecrease" column="inventory_increase_decrease" /> <result property="inventoryIncreaseDecrease" column="inventory_increase_decrease" />
<result property="inventoryHistoricalNum" column="inventory_historical_num" /> <result property="increaseDecreaseNum" column="increase_decrease_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="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
@ -42,131 +23,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectWarehouseInventoryInquiryDetailVo"> <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> </sql>
<select id="selectWarehouseInventoryInquiryDetailList" parameterType="WarehouseInventoryInquiryDetail" resultMap="WarehouseInventoryInquiryDetailResult"> <select id="selectWarehouseInventoryInquiryDetailList" parameterType="WarehouseInventoryInquiryDetail" resultMap="WarehouseInventoryInquiryDetailResult">
<include refid="selectWarehouseInventoryInquiryDetailVo"/> <include refid="selectWarehouseInventoryInquiryDetailVo"/>
<where> <where>
</where> </where>
</select> </select>
<select id="selectWarehouseInventoryInquiryDetailById" parameterType="Long" resultMap="WarehouseInventoryInquiryDetailResult"> <select id="selectWarehouseInventoryInquiryDetailById" parameterType="Long" resultMap="WarehouseInventoryInquiryDetailResult">
<include refid="selectWarehouseInventoryInquiryDetailVo"/> <include refid="selectWarehouseInventoryInquiryDetailVo"/>
where inventory_inquiry_detail_id = #{inventoryInquiryDetailId} where inventory_inquiry_detail_id = #{inventoryInquiryDetailId}
</select> </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 id="insertWarehouseInventoryInquiryDetail" parameterType="WarehouseInventoryInquiryDetail" useGeneratedKeys="true" keyProperty="inventoryInquiryDetailId">
insert into warehouse_inventory_inquiry_detail insert into warehouse_inventory_inquiry_detail
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="materialNo != null">material_no,</if> <if test="materialNo != null">material_no,</if>
<if test="materialName != null">material_name,</if> <if test="correlationCode != null">correlation_code,</if>
<if test="materialType != null">material_type,</if> <if test="inquiryBusinessType != null">inquiry_business_type,</if>
<if test="materialPhotourl != null">material_photoUrl,</if> <if test="inquiryOrderType != null">inquiry_order_type,</if>
<if test="materialBrand != null">material_brand,</if> <if test="inquiryWarehouseType != null">inquiry_warehouse_type,</if>
<if test="materialUnit != null">material_unit,</if> <if test="shippingDeviceId != null">shipping_device_id,</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="inventoryHistoricalTime != null">inventory_historical_time,</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="inventoryIncreaseDecrease != null">inventory_increase_decrease,</if>
<if test="inventoryHistoricalNum != null">inventory_historical_num,</if> <if test="increaseDecreaseNum != null">increase_decrease_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="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="materialNo != null">#{materialNo},</if> <if test="materialNo != null">#{materialNo},</if>
<if test="materialName != null">#{materialName},</if> <if test="correlationCode != null">#{correlationCode},</if>
<if test="materialType != null">#{materialType},</if> <if test="inquiryBusinessType != null">#{inquiryBusinessType},</if>
<if test="materialPhotourl != null">#{materialPhotourl},</if> <if test="inquiryOrderType != null">#{inquiryOrderType},</if>
<if test="materialBrand != null">#{materialBrand},</if> <if test="inquiryWarehouseType != null">#{inquiryWarehouseType},</if>
<if test="materialUnit != null">#{materialUnit},</if> <if test="shippingDeviceId != null">#{shippingDeviceId},</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="inventoryHistoricalTime != null">#{inventoryHistoricalTime},</if> <if test="inventoryHistoricalTime != null">#{inventoryHistoricalTime},</if>
<if test="inventoryHistoricalType != null">#{inventoryHistoricalType},</if>
<if test="inventoryIncreaseDecrease != null">#{inventoryIncreaseDecrease},</if> <if test="inventoryIncreaseDecrease != null">#{inventoryIncreaseDecrease},</if>
<if test="inventoryHistoricalNum != null">#{inventoryHistoricalNum},</if> <if test="increaseDecreaseNum != null">#{increaseDecreaseNum},</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="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
</trim> </trim>
</insert> </insert>
<update id="updateWarehouseInventoryInquiryDetail" parameterType="WarehouseInventoryInquiryDetail"> <update id="updateWarehouseInventoryInquiryDetail" parameterType="WarehouseInventoryInquiryDetail">
update warehouse_inventory_inquiry_detail update warehouse_inventory_inquiry_detail
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="materialNo != null">material_no = #{materialNo},</if> <if test="materialNo != null">material_no = #{materialNo},</if>
<if test="materialName != null">material_name = #{materialName},</if> <if test="correlationCode != null">correlation_code = #{correlationCode},</if>
<if test="materialType != null">material_type = #{materialType},</if> <if test="inquiryBusinessType != null">inquiry_business_type = #{inquiryBusinessType},</if>
<if test="materialPhotourl != null">material_photoUrl = #{materialPhotourl},</if> <if test="inquiryOrderType != null">inquiry_order_type = #{inquiryOrderType},</if>
<if test="materialBrand != null">material_brand = #{materialBrand},</if> <if test="inquiryWarehouseType != null">inquiry_warehouse_type = #{inquiryWarehouseType},</if>
<if test="materialUnit != null">material_unit = #{materialUnit},</if> <if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</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="inventoryHistoricalTime != null">inventory_historical_time = #{inventoryHistoricalTime},</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="inventoryIncreaseDecrease != null">inventory_increase_decrease = #{inventoryIncreaseDecrease},</if>
<if test="inventoryHistoricalNum != null">inventory_historical_num = #{inventoryHistoricalNum},</if> <if test="increaseDecreaseNum != null">increase_decrease_num = #{increaseDecreaseNum},</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="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
@ -181,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteWarehouseInventoryInquiryDetailByIds" parameterType="String"> <delete id="deleteWarehouseInventoryInquiryDetailByIds" parameterType="String">
delete from warehouse_inventory_inquiry_detail where inventory_inquiry_detail_id in delete from warehouse_inventory_inquiry_detail where inventory_inquiry_detail_id in
<foreach item="inventoryInquiryDetailId" collection="array" open="(" separator="," close=")"> <foreach item="inventoryInquiryDetailId" collection="array" open="(" separator="," close=")">
#{inventoryInquiryDetailId} #{inventoryInquiryDetailId}
</foreach> </foreach>

Write Preview
Loading…
Cancel
Save