From 2bf66f995e0a9ca39f09562602403cbc97b86174 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 3 Dec 2024 17:38:59 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83=E6=95=B4:?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=96=B0=E7=89=88prd=20=E9=87=8D=E5=86=99?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=A1=A8=20=E6=96=B0=E5=A2=9E=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=E5=AE=9E=E4=BD=93=E7=B1=BB=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2mapper.xm?= =?UTF-8?q?l=E6=96=87=E4=BB=B6=20=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=92=8C=E4=BB=93=E5=BA=93=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E7=9B=B8=E5=85=B3=E7=9A=84=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=9A=E5=8A=A1=20=E6=96=B0=E5=A2=9E=20=20?= =?UTF-8?q?inquiry=5Fbusiness=5Ftype=20=E5=BA=93=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B(0=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E3=80=811=E7=94=9F=E4=BA=A7=E3=80=812=E5=A7=94?= =?UTF-8?q?=E5=A4=96=E3=80=813=E9=80=80=E6=8D=A2=E8=B4=A7=E3=80=814?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9=E3=80=815=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E4=BF=AE=E6=94=B9=E3=80=816=E9=94=80=E5=94=AE?= =?UTF-8?q?=E3=80=817=E5=91=98=E5=B7=A5=E6=9C=8D=E5=8A=A1=E3=80=818?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E6=8D=9F)=20=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=20inquiry=5Forder=5Ftype=20=E5=BA=93=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B(0=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=85=A5=E5=BA=93=E5=8D=95=E3=80=811=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=85=A5=E5=BA=93=E5=8D=95=E3=80=812=E5=A7=94?= =?UTF-8?q?=E5=A4=96=E5=85=A5=E5=BA=93=E5=8D=95=E3=80=813=E9=80=80?= =?UTF-8?q?=E6=8D=A2=E8=B4=A7=E5=8D=95=E3=80=814=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8D=95=E3=80=815=E6=8D=A2=E8=B4=A7?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E3=80=816=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=80=80=E6=96=99=E5=8D=95=E3=80=817=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E9=80=80=E6=96=99=E5=8D=95=E3=80=818=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E9=80=80=E6=96=99=E5=8D=95=E3=80=819=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E9=80=80=E6=96=99=E5=8D=95=E3=80=8110=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E3=80=8111=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E3=80=8112=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E3=80=8113=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E3=80=8114=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E5=8D=95=E3=80=8115=E9=80=80=E6=8D=A2?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E3=80=8116=E5=BA=93=E5=AD=98=E6=8A=A5?= =?UTF-8?q?=E6=8D=9F=E5=8D=95)=20=E6=96=B0=E5=A2=9E=20=20inquiry=5Fwarehou?= =?UTF-8?q?se=5Ftype=20=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=B1=BB=E5=9E=8B(0=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E8=A1=A5?= =?UTF-8?q?=E8=B4=A7=E3=80=811=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E3=80=812=E5=A7=94=E5=A4=96=E5=85=A5=E5=BA=93=E3=80=813?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=80=80=E8=B4=A7=E5=85=A5=E5=BA=93=E3=80=81?= =?UTF-8?q?4=E7=9B=98=E7=9B=88=E3=80=815=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=8D=A2=E8=B4=A7=E3=80=816=E7=94=9F=E4=BA=A7=E9=80=80?= =?UTF-8?q?=E6=96=99=E3=80=817=E5=BC=80=E5=8F=91=E9=80=80=E6=96=99?= =?UTF-8?q?=E3=80=818=E5=A7=94=E5=A4=96=E9=80=80=E6=96=99=E3=80=819?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E9=80=80=E6=96=99=20=20=2010=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E9=A2=86=E6=96=99=E3=80=8111=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=A2=86=E6=96=99=E3=80=8112=E5=A7=94=E5=A4=96=E9=A2=86?= =?UTF-8?q?=E6=96=99=E3=80=8113=E5=BC=80=E5=8F=91=E9=A2=86=E6=96=99?= =?UTF-8?q?=E3=80=8114=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E3=80=8115?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=80=80=E8=B4=A7=E5=87=BA=E5=BA=93=E3=80=81?= =?UTF-8?q?16=E7=9B=98=E4=BA=8F=E3=80=8117=E6=8A=A5=E6=8D=9F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseInventoryInquiryDetail.java | 396 ++++-------------- ...houseInventoryReportDamageServiceImpl.java | 16 +- .../impl/WarehouseOutOrderServiceImpl.java | 15 +- .../WarehouseStorageOrderServiceImpl.java | 36 +- .../WarehouseInventoryInquiryDetailMapper.xml | 148 ++----- 5 files changed, 137 insertions(+), 474 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiryDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiryDetail.java index 20b00865..39dd8363 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiryDetail.java +++ b/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; @@ -10,9 +9,9 @@ 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,400 +21,151 @@ 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 Integer increaseDecreaseNum; - /** 含税总价 */ - @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) + public void setInventoryInquiryDetailId(Long inventoryInquiryDetailId) { this.inventoryInquiryDetailId = inventoryInquiryDetailId; } - public Long getInventoryInquiryDetailId() + public Long getInventoryInquiryDetailId() { return inventoryInquiryDetailId; } - public void setMaterialNo(String materialNo) + public void setMaterialNo(String materialNo) { this.materialNo = materialNo; } - public String getMaterialNo() + public String getMaterialNo() { 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; + return shippingDeviceId; } - 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; - } - public void setInventoryHistoricalTime(Date inventoryHistoricalTime) + public void setInventoryHistoricalTime(Date inventoryHistoricalTime) { this.inventoryHistoricalTime = inventoryHistoricalTime; } - public Date getInventoryHistoricalTime() + public Date getInventoryHistoricalTime() { return inventoryHistoricalTime; } - public void setInventoryHistoricalType(String inventoryHistoricalType) - { - this.inventoryHistoricalType = inventoryHistoricalType; - } - - public String getInventoryHistoricalType() - { - return inventoryHistoricalType; - } - public void setInventoryIncreaseDecrease(String inventoryIncreaseDecrease) + public void setInventoryIncreaseDecrease(String inventoryIncreaseDecrease) { this.inventoryIncreaseDecrease = inventoryIncreaseDecrease; } - public String getInventoryIncreaseDecrease() + public String getInventoryIncreaseDecrease() { 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(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java index 95b67f51..92c41a3b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java +++ b/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()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java index 59265e3c..c7969ed7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java +++ b/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("新增库存历史数据失败"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index 25ac4673..6b1ac73f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/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()); diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml index 3e0f79d8..26b29fd8 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml @@ -1,39 +1,20 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - + @@ -42,131 +23,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - + - - - insert into warehouse_inventory_inquiry_detail 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, + correlation_code, + inquiry_business_type, + inquiry_order_type, + inquiry_warehouse_type, + shipping_device_id, 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, + increase_decrease_num, remark, create_time, create_by, update_by, update_time, - + #{materialNo}, - #{materialName}, - #{materialType}, - #{materialPhotourl}, - #{materialBrand}, - #{materialUnit}, - #{materialDescribe}, - #{materialProcessMethod}, - #{materialModel}, - #{materialSpecification}, - #{historicalTotal}, - #{availableStockNum}, - #{attributionAvailableStockNum}, - #{noattributionAvailableStockNum}, - #{useNum}, - #{reportDamageNum}, - #{materialUseStatus}, - #{inventoryAttributionCode}, - #{inventoryUseCode}, + #{correlationCode}, + #{inquiryBusinessType}, + #{inquiryOrderType}, + #{inquiryWarehouseType}, + #{shippingDeviceId}, #{inventoryHistoricalTime}, - #{inventoryHistoricalType}, #{inventoryIncreaseDecrease}, - #{inventoryHistoricalNum}, - #{purchasePriceExcludingTax}, - #{purchasePriceIncludesTax}, - #{purchaseOrderCode}, - #{supplierCode}, - #{supplierName}, + #{increaseDecreaseNum}, #{remark}, #{createTime}, #{createBy}, #{updateBy}, #{updateTime}, - + update warehouse_inventory_inquiry_detail material_no = #{materialNo}, - material_name = #{materialName}, - material_type = #{materialType}, - material_photoUrl = #{materialPhotourl}, - material_brand = #{materialBrand}, - material_unit = #{materialUnit}, - material_describe = #{materialDescribe}, - material_process_method = #{materialProcessMethod}, - material_model = #{materialModel}, - material_specification = #{materialSpecification}, - historical_total = #{historicalTotal}, - available_stock_num = #{availableStockNum}, - attribution_available_stock_num = #{attributionAvailableStockNum}, - noattribution_available_stock_num = #{noattributionAvailableStockNum}, - use_num = #{useNum}, - report_damage_num = #{reportDamageNum}, - material_use_status = #{materialUseStatus}, - inventory_attribution_code = #{inventoryAttributionCode}, - inventory_use_code = #{inventoryUseCode}, + correlation_code = #{correlationCode}, + inquiry_business_type = #{inquiryBusinessType}, + inquiry_order_type = #{inquiryOrderType}, + inquiry_warehouse_type = #{inquiryWarehouseType}, + shipping_device_id = #{shippingDeviceId}, inventory_historical_time = #{inventoryHistoricalTime}, - inventory_historical_type = #{inventoryHistoricalType}, inventory_increase_decrease = #{inventoryIncreaseDecrease}, - inventory_historical_num = #{inventoryHistoricalNum}, - purchase_price_excluding_tax = #{purchasePriceExcludingTax}, - purchase_price_includes_tax = #{purchasePriceIncludesTax}, - purchase_order_code = #{purchaseOrderCode}, - supplier_code = #{supplierCode}, - supplier_name = #{supplierName}, + increase_decrease_num = #{increaseDecreaseNum}, remark = #{remark}, create_time = #{createTime}, create_by = #{createBy}, @@ -181,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from warehouse_inventory_inquiry_detail where inventory_inquiry_detail_id in + delete from warehouse_inventory_inquiry_detail where inventory_inquiry_detail_id in #{inventoryInquiryDetailId}