From 067af762685339aa35f970e0ddb10c50bec69a04 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 2 Dec 2024 14:02:08 +0800
Subject: [PATCH 01/10] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=E6=80=BB=E7=BB=8F=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=96=B9=E6=B3=95=E4=B8=AD=20=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E4=BA=BA=E5=B7=A5=E6=88=90=E6=9C=AC=E3=80=81=E4=B8=8D?=
 =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=8E=A8=E5=B9=BF=E6=88=90=E6=9C=AC=E3=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E4=B8=9A=E5=8A=A1=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E7=AE=A1=E7=90=86=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E7=9B=B8=E5=85=B3=E7=9A=84=E6=96=B9=E6=B3=95=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=20=E4=BB=8E=20`salesEstimateDetailVo`=20?=
 =?UTF-8?q?=E4=B8=AD=E8=8E=B7=E5=8F=96=E5=85=B6=E4=BB=96=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=96=B9=E6=B3=95=E4=B8=AD=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8A=E8=BF=B0=E5=9B=9B=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E7=9A=84?=
 =?UTF-8?q?=E6=80=BB=E7=BB=8F=E8=90=A5=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E5=90=88=E8=AE=A1=EF=BC=9B=E8=AE=A1=E7=AE=97=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E5=B9=B4=E5=BA=A6=E5=90=AB=E7=A8=8E=E6=80=BB=E7=BB=8F?=
 =?UTF-8?q?=E8=90=A5=E6=88=90=E6=9C=AC=EF=BC=8C=E5=A2=9E=E5=80=BC=E7=A8=8E?=
 =?UTF-8?q?=E7=8E=87=E4=B8=BA=2013%=EF=BC=9B=E8=AE=A1=E7=AE=97=20=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E5=B9=B4=E5=BA=A6=E6=80=BB=E7=89=A9=E6=96=99=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=80=BC=E7=A8=8E=E7=8E=87=E4=B8=BA=2013%=EF=BC=9B=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E8=AF=A5=E6=96=99=E5=8F=B7=E7=9A=84=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC=20(RMB)=3D(?=
 =?UTF-8?q?=E8=AF=A5=E6=96=99=E5=8F=B7=E7=9A=84BOM=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E9=87=87=E8=B4=AD=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC/=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E6=80=BB?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1)*=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E7=9A=84=E6=80=BB=E7=BB=8F=E8=90=A5=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=EF=BC=9B=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E8=AF=A5=E6=96=99=E5=8F=B7=E7=9A=84=E5=90=AB=E7=A8=8E=E7=BB=8F?=
 =?UTF-8?q?=E8=90=A5=E6=88=90=E6=9C=AC=20(RMB)=3D(=E8=AF=A5=E6=96=99?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84BOM=E7=89=A9=E6=96=99=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=80=BB=E9=87=87=E8=B4=AD=E6=88=90=E6=9C=AC/=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E5=B9=B4=E5=BA=A6=E6=80=BB=E7=89=A9=E6=96=99=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1)*=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E5=B9=B4=E5=BA=A6=E7=9A=84=E6=80=BB=E7=BB=8F=E8=90=A5?=
 =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=80=BB=E7=BB=8F=E8=90=A5=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC->=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E6=80=BB?=
 =?UTF-8?q?=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC;=E6=80=BB=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=88=90=E6=9C=AC->=E4=B8=8A=E4=B8=80=E5=B9=B4?=
 =?UTF-8?q?=E5=BA=A6=E6=80=BB=E7=89=A9=E6=96=99=E6=88=90=E6=9C=AC;=20?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9B=91=E5=90=AC=E5=8E=BB=E6=8E=89=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E5=9B=9B=E4=B8=AA=E6=88=90=E6=9C=AC=E7=9A=84=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E4=BA=8B=E4=BB=B6=EF=BC=8C=E5=8A=A0=E4=B8=8AtotalOper?=
 =?UTF-8?q?atingCosts=E7=9B=91=E5=90=AC=E4=BA=8B=E4=BB=B6=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20calculateOperatingCosts=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=BE=93=E5=85=A5=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=80=BB=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC(RMB)=EF=BC=8C?=
 =?UTF-8?q?=E5=92=8C=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC(RMB)=E5=8A=A8=E6=80=81=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?(RMB)=E3=80=81=E5=90=AB=E7=A8=8E=E7=BB=8F=E8=90=A5=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC(RMB)=20=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E3=80=81=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=92=8Cmapper.xml=E5=B1=82=E7=9A=84?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=80=BB=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=20=E7=89=A9=E6=96=99=E8=AF=A6=E6=83=85=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=8C=85=E6=8B=ACform=E8=A1=A8=E5=8D=95=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=E5=8E=BB=E6=8E=89=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E6=88=90=E6=9C=AC=E3=80=81=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E6=8E=A8=E5=B9=BF=E6=88=90=E6=9C=AC=E3=80=81=E4=B8=8D?=
 =?UTF-8?q?=E5=90=AB=E7=A8=8E=E4=B8=9A=E5=8A=A1=E6=88=90=E6=9C=AC=E3=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E7=AE=A1=E7=90=86=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=20=E4=B8=8A=E4=B8=80=E5=B9=B4?=
 =?UTF-8?q?=E5=BA=A6=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E7=BB=8F=E8=90=A5?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=AD=97=E6=AE=B5=20=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=89=A9=E6=96=99=E4=BB=B7=E6=A0=BC=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9A=E6=96=B0=E5=A2=9E=20=E7=BB=99?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=80=BB=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E4=B9=8B=E5=89=8D=E5=9B=9B=E4=B8=AA?=
 =?UTF-8?q?=E7=9A=84=E8=B5=8B=E5=80=BC=20=E4=BF=AE=E6=94=B9=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7Vo=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=96=B9=E6=B3=95=EF=BC=9A=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E7=BB=99=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E6=80=BB=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=EF=BC=8C=E5=8E=BB=E6=8E=89=E4=B9=8B=E5=89=8D=E5=9B=9B?=
 =?UTF-8?q?=E4=B8=AA=E7=9A=84=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sales/domain/SalesEstimateDetail.java     |  13 ++
 .../VO/SalesEstimateDetailMaterialVo.java     |  13 +-
 ...alesEstimateDetailMaterialServiceImpl.java |   5 +-
 .../impl/SalesEstimateServiceImpl.java        |   6 +-
 .../sales/SalesEstimateDetailMapper.xml       |   8 +-
 .../templates/sales/estimate/ceoAdd.html      | 177 +++++++-----------
 6 files changed, 94 insertions(+), 128 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateDetail.java
index 2544a160..b4b1b282 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateDetail.java
@@ -135,6 +135,11 @@ public class SalesEstimateDetail extends BaseEntity
     /** 含税经营成本（RMB） */
     private BigDecimal taxOperatingCosts;
 
+
+    /** 上一年度不含税总经营成本(RMB) */
+    private BigDecimal totalOperatingCosts;
+
+
     /** 销售估价详情物料子表集合 */
     private List<SalesEstimateDetailMaterial> salesEstimateDetailMaterialList;
 
@@ -427,6 +432,13 @@ public class SalesEstimateDetail extends BaseEntity
         return taxOperatingCosts;
     }
 
+    public BigDecimal getTotalOperatingCosts() {
+        return totalOperatingCosts;
+    }
+
+    public void setTotalOperatingCosts(BigDecimal totalOperatingCosts) {
+        this.totalOperatingCosts = totalOperatingCosts;
+    }
 
     public List<SalesEstimateDetailMaterial> getSalesEstimateDetailMaterialList() {
         return salesEstimateDetailMaterialList;
@@ -471,6 +483,7 @@ public class SalesEstimateDetail extends BaseEntity
             .append("noTaxMaterialCosts", getNoTaxMaterialCosts())
             .append("noTaxOperatingCosts", getNoTaxOperatingCosts())
             .append("taxOperatingCosts", getTaxOperatingCosts())
+            .append("totalOperatingCosts", getTotalOperatingCosts())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/VO/SalesEstimateDetailMaterialVo.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/VO/SalesEstimateDetailMaterialVo.java
index 0c6030f8..775dd7d3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/VO/SalesEstimateDetailMaterialVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/VO/SalesEstimateDetailMaterialVo.java
@@ -17,17 +17,8 @@ public class SalesEstimateDetailMaterialVo extends SalesEstimateDetailMaterial {
     /** 不含税开发成本（RMB） */
     private BigDecimal noTaxDevelopCosts;
 
-    /** 不含税人工成本（RMB） */
-    private BigDecimal noTaxLaborCosts;
-
-    /** 不含税推广成本（RMB） */
-    private BigDecimal noTaxPromotionalCosts;
-
-    /** 不含税业务成本（RMB） */
-    private BigDecimal noTaxBusinessCosts;
-
-    /** 不含税管理成本（RMB） */
-    private BigDecimal noTaxManagesCosts;
+    /** 上一年度不含税总经营成本(RMB) */
+    private BigDecimal totalOperatingCosts;
 
     /** 不含税总物料成本（RMB） */
     private BigDecimal noTaxMaterialCosts;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateDetailMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateDetailMaterialServiceImpl.java
index 23b193bb..4452bc3a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateDetailMaterialServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateDetailMaterialServiceImpl.java
@@ -92,16 +92,13 @@ public class SalesEstimateDetailMaterialServiceImpl implements ISalesEstimateDet
 
     private void setCosts(SalesEstimateDetailMaterialVo vo, SalesEstimateDetail salesEstimateDetail) {
         vo.setNoTaxMaterialCosts(salesEstimateDetail.getNoTaxMaterialCosts());
-        vo.setNoTaxBusinessCosts(salesEstimateDetail.getNoTaxBusinessCosts());
         vo.setNoTaxDevelopCosts(salesEstimateDetail.getNoTaxDevelopCosts());
-        vo.setNoTaxLaborCosts(salesEstimateDetail.getNoTaxLaborCosts());
-        vo.setNoTaxManagesCosts(salesEstimateDetail.getNoTaxManagesCosts());
         vo.setNoTaxOperatingCosts(salesEstimateDetail.getNoTaxOperatingCosts());
         vo.setTaxOperatingCosts(salesEstimateDetail.getTaxOperatingCosts());
-        vo.setNoTaxPromotionalCosts(salesEstimateDetail.getNoTaxPromotionalCosts());
         vo.setNoTaxServiceCosts(salesEstimateDetail.getNoTaxServiceCosts());
         vo.setNoTaxShippingCosts(salesEstimateDetail.getNoTaxShippingCosts());
         vo.setProfitRate(salesEstimateDetail.getProfitRate());
+        vo.setTotalOperatingCosts(salesEstimateDetail.getTotalOperatingCosts());
 
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
index 26c15b03..764f3d23 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
@@ -213,10 +213,8 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
         salesEstimateDetailVo.setEProfitRate(salesEstimateTemplate.geteProfitRate());
         salesEstimateDetailVo.setFProfitRate(salesEstimateTemplate.getfProfitRate());
 
-        salesEstimateDetailVo.setNoTaxLaborCosts(salesEstimateTemplate.getNoTaxLaborCosts());
-        salesEstimateDetailVo.setNoTaxBusinessCosts(salesEstimateTemplate.getNoTaxBusinessCosts());
-        salesEstimateDetailVo.setNoTaxManagesCosts(salesEstimateTemplate.getNoTaxManagesCosts());
-        salesEstimateDetailVo.setNoTaxPromotionalCosts(salesEstimateTemplate.getNoTaxPromotionalCosts());
+
+        salesEstimateDetailVo.setTotalOperatingCosts(salesEstimateTemplate.getTotalOperatingCosts());
         salesEstimateDetailVo.setNoTaxMaterialCosts(salesEstimateTemplate.getNoTaxMaterialCosts());
         return salesEstimateDetailVo;
     }
diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMapper.xml
index 02554362..e964afc5 100644
--- a/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMapper.xml
@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="noTaxMaterialCosts"    column="no_tax_material_costs"    />
         <result property="noTaxOperatingCosts"    column="no_tax_operating_costs"    />
         <result property="taxOperatingCosts"    column="tax_operating_costs"    />
+        <result property="totalOperatingCosts"    column="total_operating_costs"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSalesEstimateDetailVo">
-        select estimate_detail_id, sales_estimate_code, material_gear_position, usd_rate, profit_rate, material_no, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_method, material_num, no_tax_rmb, tax_rmb, all_no_tax_rmb, all_tax_rmb, tax_dollar, no_tax_dollar, all_tax_dollar, all_no_tax_dollar, no_tax_shipping_costs, no_tax_service_costs, no_tax_develop_costs, no_tax_labor_costs, no_tax_promotional_costs, no_tax_business_costs, no_tax_manages_costs, no_tax_material_costs, no_tax_operating_costs, tax_operating_costs, create_by, create_time, update_by, update_time, remark from sales_estimate_detail
+        select estimate_detail_id, sales_estimate_code, material_gear_position, usd_rate, profit_rate, material_no, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_method, material_num, no_tax_rmb, tax_rmb, all_no_tax_rmb, all_tax_rmb, tax_dollar, no_tax_dollar, all_tax_dollar, all_no_tax_dollar, no_tax_shipping_costs, no_tax_service_costs, no_tax_develop_costs, no_tax_labor_costs, no_tax_promotional_costs, no_tax_business_costs, no_tax_manages_costs, no_tax_material_costs, no_tax_operating_costs, tax_operating_costs,  total_operating_costs, create_by, create_time, update_by, update_time, remark from sales_estimate_detail
     </sql>
 
     <select id="selectSalesEstimateDetailList" parameterType="SalesEstimateDetail" resultMap="SalesEstimateDetailResult">
@@ -102,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="noTaxMaterialCosts != null">no_tax_material_costs,</if>
             <if test="noTaxOperatingCosts != null">no_tax_operating_costs,</if>
             <if test="taxOperatingCosts != null">tax_operating_costs,</if>
+            <if test="totalOperatingCosts != null">total_operating_costs,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -140,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="noTaxMaterialCosts != null">#{noTaxMaterialCosts},</if>
             <if test="noTaxOperatingCosts != null">#{noTaxOperatingCosts},</if>
             <if test="taxOperatingCosts != null">#{taxOperatingCosts},</if>
+            <if test="totalOperatingCosts != null">#{totalOperatingCosts},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -184,6 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         no_tax_material_costs,
         no_tax_operating_costs,
         tax_operating_costs,
+        total_operating_costs,
         create_by,
         create_time
         )
@@ -220,6 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.noTaxMaterialCosts},
             #{item.noTaxOperatingCosts},
             #{item.taxOperatingCosts},
+            #{item.totalOperatingCosts},
             #{item.createBy},
             #{item.createTime}
         </foreach>
@@ -263,6 +268,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="noTaxMaterialCosts != null">no_tax_material_costs = #{noTaxMaterialCosts},</if>
             <if test="noTaxOperatingCosts != null">no_tax_operating_costs = #{noTaxOperatingCosts},</if>
             <if test="taxOperatingCosts != null">tax_operating_costs = #{taxOperatingCosts},</if>
+            <if test="totalOperatingCosts != null">total_operating_costs = #{totalOperatingCosts},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
index 418667f8..e92a1b4a 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
@@ -132,10 +132,6 @@
                     "noTaxDevelopCosts": null, // 初始化为 null 或 0
                     "noTaxShippingCosts": null,
                     "noTaxServiceCosts": null,
-                    "noTaxLaborCosts": null,
-                    "noTaxPromotionalCosts": null,
-                    "noTaxBusinessCosts": null,
-                    "noTaxManagesCosts": null,
                     "noTaxMaterialCosts": null,
                     "noTaxOperatingCosts": null,
                     "taxOperatingCosts": null,
@@ -149,10 +145,6 @@
                 var noTaxDevelopCosts = $('#noTaxDevelopCosts' + index).val();
                 var noTaxShippingCosts = $('#noTaxShippingCosts' + index).val();
                 var noTaxServiceCosts = $('#noTaxServiceCosts' + index).val();
-                var noTaxLaborCosts = $('#noTaxLaborCosts' + index).val();
-                var noTaxPromotionalCosts = $('#noTaxPromotionalCosts' + index).val();
-                var noTaxBusinessCosts = $('#noTaxBusinessCosts' + index).val();
-                var noTaxManagesCosts = $('#noTaxManagesCosts' + index).val();
                 var noTaxMaterialCosts = $('#noTaxMaterialCosts' + index).val();
                 var noTaxOperatingCosts = $('#noTaxOperatingCosts' + index).val();
                 var taxOperatingCosts = $('#taxOperatingCosts' + index).val();
@@ -174,27 +166,6 @@
                     hasError = true;
                     return; // 退出循环，阻止进一步处理
                 }
-
-                if (!noTaxLaborCosts && noTaxLaborCosts !== '0') {
-                    $.modal.alertWarning("人工成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的人工成本");
-                    hasError = true;
-                    return; // 退出循环，阻止进一步处理
-                }
-                if (!noTaxPromotionalCosts && noTaxPromotionalCosts !== '0') {
-                    $.modal.alertWarning("推广成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的推广成本");
-                    hasError = true;
-                    return; // 退出循环，阻止进一步处理
-                }
-                if (!noTaxBusinessCosts && noTaxBusinessCosts !== '0') {
-                    $.modal.alertWarning("业务成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的业务成本");
-                    hasError = true;
-                    return; // 退出循环，阻止进一步处理
-                }
-                if (!noTaxManagesCosts && noTaxManagesCosts !== '0') {
-                    $.modal.alertWarning("管理成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的管理成本");
-                    hasError = true;
-                    return; // 退出循环，阻止进一步处理
-                }
                 if (!noTaxMaterialCosts && noTaxMaterialCosts !== '0') {
                     $.modal.alertWarning("物料成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的物料成本");
                     hasError = true;
@@ -220,10 +191,6 @@
                 estimateMaterialDataList[index].noTaxDevelopCosts = noTaxDevelopCosts;
                 estimateMaterialDataList[index].noTaxShippingCosts = noTaxShippingCosts;
                 estimateMaterialDataList[index].noTaxServiceCosts = noTaxServiceCosts;
-                estimateMaterialDataList[index].noTaxLaborCosts = noTaxLaborCosts;
-                estimateMaterialDataList[index].noTaxPromotionalCosts = noTaxPromotionalCosts;
-                estimateMaterialDataList[index].noTaxBusinessCosts = noTaxBusinessCosts;
-                estimateMaterialDataList[index].noTaxManagesCosts = noTaxManagesCosts;
                 estimateMaterialDataList[index].noTaxMaterialCosts = noTaxMaterialCosts;
                 estimateMaterialDataList[index].noTaxOperatingCosts = noTaxOperatingCosts;
                 estimateMaterialDataList[index].taxOperatingCosts = taxOperatingCosts;
@@ -489,8 +456,8 @@
                     var firstRow = data[0].rows[0];
 
                    // 初始化累积变量
-                    let noTaxPurchaseRmb = 0;
-                    let taxPurchaseRmb = 0;
+                    let noTaxPurchaseRmb = 0; //不含税采购总成本
+                    let taxPurchaseRmb = 0; //含税采购总成本
 
                    // 累加无税购买金额
                     data[0].rows.forEach(function (row) {
@@ -517,32 +484,31 @@
 
                     // 从 `salesEstimateDetailVo` 中获取其他成本信息
                     const {
-                        noTaxLaborCosts = '',
-                        noTaxPromotionalCosts = '',
-                        noTaxBusinessCosts = '',
-                        noTaxManagesCosts = '',
-                        noTaxMaterialCosts = ''
+                        totalOperatingCosts = '', //上一年度的总经营不含税成本合计
+                        noTaxMaterialCosts = ''  // 上一年度总物料不含税成本合计
                     } = salesEstimateDetailVo || {};
 
-                    // 计算不含税总经营成本
-                    const noAllTaxOperatingCosts = (
-                        parseFloat(noTaxLaborCosts) +
-                        parseFloat(noTaxBusinessCosts) +
-                        parseFloat(noTaxManagesCosts) +
-                        parseFloat(noTaxPromotionalCosts)
-                    ).toFixed(2) || '';
 
-                    // 计算含税总经营成本，假设增值税率为 13%
+                    // 计算上一年度含税总经营成本，假设增值税率为 13%
                     const allTaxOperatingCosts = (
-                        parseFloat(noAllTaxOperatingCosts) * 1.13
+                        parseFloat(totalOperatingCosts) * 1.13
+                    ).toFixed(2) || '';
+
+                    //上一年度总物料含税成本合计
+                    const allTaxMaterialCosts = (
+                        parseFloat(noTaxMaterialCosts) * 1.13
                     ).toFixed(2) || '';
-                    //该料号的不含税经营成本
+
+
+                    //该料号的不含税经营成本 (RMB)=(该料号的BOM物料不含税总采购成本/上一年度总物料不含税成本合计)*上一年度的总经营不含税成本合计
                     const noTaxOperatingCosts = (
-                        (noTaxPurchaseRmb/noTaxMaterialCosts) * noAllTaxOperatingCosts
+                        (noTaxPurchaseRmb/noTaxMaterialCosts) * totalOperatingCosts
                     ).toFixed(2) || '';
-                    // 该料号的含税经营成本
+
+
+                    // 该料号的含税经营成本 (RMB)=(该料号的BOM物料含税总采购成本/上一年度总物料含税成本合计)*上一年度的总经营含税成本合计
                     const taxOperatingCosts = (
-                        (taxPurchaseRmb/noTaxMaterialCosts) * allTaxOperatingCosts
+                        (taxPurchaseRmb/allTaxMaterialCosts) * allTaxOperatingCosts
                     ).toFixed(2) || '';
                     // 根据 `parentRow.profitRate` 设置利润率
                     let profitRateKey = 'aprofitRate';
@@ -572,10 +538,7 @@
                         noTaxDevelopCosts,
                         noTaxShippingCosts,
                         noTaxServiceCosts,
-                        noTaxLaborCosts,
-                        noTaxPromotionalCosts,
-                        noTaxBusinessCosts,
-                        noTaxManagesCosts,
+                        totalOperatingCosts,
                         noTaxMaterialCosts,
                         noTaxOperatingCosts,
                         taxOperatingCosts,
@@ -590,10 +553,7 @@
                         noTaxDevelopCosts: '',
                         noTaxShippingCosts: '',
                         noTaxServiceCosts: '',
-                        noTaxLaborCosts: '',
-                        noTaxPromotionalCosts: '',
-                        noTaxBusinessCosts: '',
-                        noTaxManagesCosts: '',
+                        totalOperatingCosts: '',
                         noTaxMaterialCosts: '',
                         noTaxOperatingCosts: '',
                         taxOperatingCosts: '',
@@ -616,24 +576,12 @@
                 formHtml += '<label for="noTaxServiceCosts' + index + '">不含税服务成本(RMB):</label>';
                 formHtml += '<input type="text" class="form-control" id="noTaxServiceCosts' + index + '" name="noTaxServiceCosts' + index + '" value="' + costs.noTaxServiceCosts + '" readonly>';
                 formHtml += '</div>';
-                formHtml += '<h3>总经营成本</h3>';
+                formHtml += '<h3>上一年度总经营成本</h3>';
                 formHtml += '<div class="form-group">';
-                formHtml += '<label for="noTaxLaborCosts' + index + '">不含税人工成本(RMB):</label>';
-                formHtml += '<input type="text" class="form-control" id="noTaxLaborCosts' + index + '" name="noTaxLaborCosts' + index + '" value="' + costs.noTaxLaborCosts + '">';
+                formHtml += '<label for="totalOperatingCosts' + index + '">不含税总经营成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="totalOperatingCosts' + index + '" name="totalOperatingCosts' + index + '" value="' + costs.totalOperatingCosts + '">';
                 formHtml += '</div>';
-                formHtml += '<div class="form-group">';
-                formHtml += '<label for="noTaxPromotionalCosts' + index + '">不含税推广成本(RMB):</label>';
-                formHtml += '<input type="text" class="form-control" id="noTaxPromotionalCosts' + index + '" name="noTaxPromotionalCosts' + index + '" value="' + costs.noTaxPromotionalCosts + '">';
-                formHtml += '</div>';
-                formHtml += '<div class="form-group">';
-                formHtml += '<label for="noTaxBusinessCosts' + index + '">不含税业务成本(RMB):</label>';
-                formHtml += '<input type="text" class="form-control" id="noTaxBusinessCosts' + index + '" name="noTaxBusinessCosts' + index + '" value="' + costs.noTaxBusinessCosts + '">';
-                formHtml += '</div>';
-                formHtml += '<div class="form-group">';
-                formHtml += '<label for="noTaxManagesCosts' + index + '">不含税管理成本(RMB):</label>';
-                formHtml += '<input type="text" class="form-control" id="noTaxManagesCosts' + index + '" name="noTaxManagesCosts' + index + '" value="' + costs.noTaxManagesCosts + '">';
-                formHtml += '</div>';
-                formHtml += '<h3>总物料成本</h3>';
+                formHtml += '<h3>上一年度总物料成本</h3>';
                 formHtml += '<div class="form-group">';
                 formHtml += '<label for="noTaxMaterialCosts' + index + '">不含税总物料成本(RMB):</label>';
                 formHtml += '<input type="text" class="form-control" id="noTaxMaterialCosts' + index + '" name="noTaxMaterialCosts' + index + '" value="' + costs.noTaxMaterialCosts + '">';
@@ -669,17 +617,8 @@
 
                     // 根据 input 的 id 或 name 进行相应的计算
                     switch (inputId) {
-                        case 'noTaxLaborCosts' + index:
-                            calculateOperatingCosts(inputValue, 'noTaxLaborCosts');
-                            break;
-                        case 'noTaxPromotionalCosts' + index:
-                            calculateOperatingCosts(inputValue, 'noTaxPromotionalCosts');
-                            break;
-                        case 'noTaxBusinessCosts' + index:
-                            calculateOperatingCosts(inputValue, 'noTaxBusinessCosts');
-                            break;
-                        case 'noTaxManagesCosts' + index:
-                            calculateOperatingCosts(inputValue, 'noTaxManagesCosts');
+                        case 'totalOperatingCosts' + index:
+                            calculateOperatingCosts(inputValue, 'totalOperatingCosts');
                             break;
                         case 'noTaxMaterialCosts' + index:
                             updateMaterialCosts(inputValue);
@@ -692,21 +631,21 @@
                 });
 
                 function calculateOperatingCosts(value, costType) {
-                    var noAllTaxOperatingCosts = 0;
+                    // var totalOperatingCosts = 0;
                     var allNoTaxPurchaseRmb = 0;
                     var allTaxPurchaseRmb = 0;
 
-                    // 获取所有相关的不含税成本
-                    ['noTaxLaborCosts', 'noTaxPromotionalCosts', 'noTaxBusinessCosts', 'noTaxManagesCosts'].forEach(function(cost) {
-                        var currentCost = parseFloat($form.find('#' + cost + index).val());
-                        noAllTaxOperatingCosts += currentCost;
-                    });
+                    // // 获取所有相关的不含税成本
+                    // ['noTaxLaborCosts', 'noTaxPromotionalCosts', 'noTaxBusinessCosts', 'noTaxManagesCosts'].forEach(function(cost) {
+                    //     var currentCost = parseFloat($form.find('#' + cost + index).val());
+                    //     noAllTaxOperatingCosts += currentCost;
+                    // });
 
-                    // 更新不含税总经营成本
-                    $form.find('#noAllTaxOperatingCosts' + index).val(noAllTaxOperatingCosts.toFixed(2));
+                    // 更新上一年度不含税总经营成本
+                    var totalOperatingCosts = parseFloat($form.find('#totalOperatingCosts' + index).val());
 
-                    // 计算含税总经营成本
-                    var allTaxOperatingCosts = noAllTaxOperatingCosts * 1.13;
+                    // 计算上一年度含税总经营成本
+                    var allTaxOperatingCosts = totalOperatingCosts * 1.13;
                     $form.find('#allTaxOperatingCosts' + index).val(allTaxOperatingCosts.toFixed(2));
 
                     // 遍历数据集计算不含税采购成本和含税采购成本
@@ -720,13 +659,16 @@
                         });
                     });
 
-                    // 该料号的不含税经营成本
-                    var noTaxMaterialCosts = parseFloat($form.find('#noTaxMaterialCosts' + index).val());
-                    var noTaxOperatingCosts = (allNoTaxPurchaseRmb / noTaxMaterialCosts) * noAllTaxOperatingCosts;
+
+                    var noTaxMaterialCosts = parseFloat($form.find('#noTaxMaterialCosts' + index).val());//不含税总物料成本
+                    var allTaxMaterialCosts = noTaxMaterialCosts * 1.13;//含税总物料成本
+
+                    // 该料号的不含税经营成本(RMB)=(该料号的BOM物料不含税总采购成本/上一年度总物料不含税成本合计)*上一年度的总经营不含税成本合计
+                    var noTaxOperatingCosts = (allNoTaxPurchaseRmb / noTaxMaterialCosts) * totalOperatingCosts;
                     $form.find('#noTaxOperatingCosts' + index).val(noTaxOperatingCosts.toFixed(2));
 
-                    // 该料号的含税经营成本
-                    var taxOperatingCosts = (allTaxPurchaseRmb / noTaxMaterialCosts) * allTaxOperatingCosts;
+                    // 该料号含税经营成本(RMB)=(该料号的BOM物料含税总采购成本/上一年度总物料含税成本合计)*上一年度的总经营含税成本合计
+                    var taxOperatingCosts = (allTaxPurchaseRmb / allTaxMaterialCosts) * allTaxOperatingCosts;
                     $form.find('#taxOperatingCosts' + index).val(taxOperatingCosts.toFixed(2));
                 }
 
@@ -747,14 +689,33 @@
                         });
                     });
 
-                    // 更新不含税经营成本
-                    var noAllTaxOperatingCosts = parseFloat($form.find('#noAllTaxOperatingCosts' + index).val());
-                    var noTaxOperatingCosts = (noTaxPurchaseRmb / value) * noAllTaxOperatingCosts;
+                    // // 更新不含税经营成本
+                    // var noAllTaxOperatingCosts = parseFloat($form.find('#noAllTaxOperatingCosts' + index).val());
+                    // var noTaxOperatingCosts = (noTaxPurchaseRmb / value) * noAllTaxOperatingCosts;
+                    // $form.find('#noTaxOperatingCosts' + index).val(noTaxOperatingCosts.toFixed(2));
+                    //
+                    // // 更新含税经营成本
+                    // var taxOperatingCosts = (taxPurchaseRmb / value) * noAllTaxOperatingCosts;
+                    // $form.find('#taxOperatingCosts' + index).val(taxOperatingCosts.toFixed(2));
+
+                    // 更新上一年度不含税总经营成本
+                    var totalOperatingCosts = parseFloat($form.find('#totalOperatingCosts' + index).val());
+
+                    // 计算上一年度含税总经营成本
+                    var allTaxOperatingCosts = totalOperatingCosts * 1.13;
+                    $form.find('#allTaxOperatingCosts' + index).val(allTaxOperatingCosts.toFixed(2));
+
+                    // 该料号的不含税经营成本(RMB)=(该料号的BOM物料不含税总采购成本/上一年度总物料不含税成本合计)*上一年度的总经营不含税成本合计
+                    var noTaxMaterialCosts = parseFloat($form.find('#noTaxMaterialCosts' + index).val());
+                    var allTaxMaterialCosts = noTaxMaterialCosts * 1.13;
+                    var noTaxOperatingCosts = (allNoTaxPurchaseRmb / noTaxMaterialCosts) * totalOperatingCosts;
                     $form.find('#noTaxOperatingCosts' + index).val(noTaxOperatingCosts.toFixed(2));
 
-                    // 更新含税经营成本
-                    var taxOperatingCosts = (taxPurchaseRmb / value) * noAllTaxOperatingCosts;
+                    // 该料号含税经营成本(RMB)=(该料号的BOM物料含税总采购成本/上一年度总物料含税成本合计)*上一年度的总经营含税成本合计
+                    var taxOperatingCosts = (allTaxPurchaseRmb / allTaxMaterialCosts) * allTaxOperatingCosts;
                     $form.find('#taxOperatingCosts' + index).val(taxOperatingCosts.toFixed(2));
+
+
                 }
             }
         });

From 1b63514992bea9c813f790396315f422593b3885 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 2 Dec 2024 15:25:06 +0800
Subject: [PATCH 02/10] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E4=BC=B0?=
 =?UTF-8?q?=E4=BB=B7=E7=9A=84=E6=80=BB=E7=BB=8F=E7=90=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=80=BB=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=20=E5=8E=BB=E6=8E=89=E4=B8=8D=E5=90=AB=E7=A8=8E=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E6=88=90=E6=9C=AC=E5=92=8C=E5=90=AB=E7=A8=8E=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E6=88=90=E6=9C=AC=E4=B9=98=E4=BB=A5=E7=94=A8=E9=87=8F?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A1=E7=AE=97=E8=A7=84=E5=88=99=20=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E6=80=BB=E7=BB=8F?=
 =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E9=87=8D=E5=86=99=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E6=80=BB=E7=BB=8F=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=8C=89=E7=85=A7=E4=BB=A5=E4=B8=8B?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=A7=84=E5=88=99=E8=AE=A1=E7=AE=97=201?=
 =?UTF-8?q?=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=96=99=E5=8F=B7=E4=BC=B0?=
 =?UTF-8?q?=E4=BB=B7=E6=88=90=E6=9C=AC=3D=E8=AF=A5=E6=96=99=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84BOM=E7=89=A9=E6=96=99=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=80=BB=E9=87=87=E8=B4=AD=E6=88=90=E6=9C=AC+=E4=B8=8D?=
 =?UTF-8?q?=E5=90=AB=E7=A8=8E=E8=BF=90=E8=BE=93=E6=88=90=E6=9C=AC+?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=9C=8D=E5=8A=A1=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?+=E4=B8=8D=E5=90=AB=E7=A8=8E=E5=BC=80=E5=8F=91=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC+(=E8=AF=A5=E6=96=99=E5=8F=B7=E7=9A=84BOM=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC/=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=88=90=E6=9C=AC)*=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E7=9A=84=E6=80=BB=E7=BB=8F=E8=90=A5=E4=B8=8D?=
 =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=201.1?=
 =?UTF-8?q?=E3=80=81=E8=AF=A5=E6=96=99=E5=8F=B7=E7=9A=84BOM=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=3D=E6=89=8B=E5=A1=AB=E7=9A=84bom=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=9A=84=E6=80=BB=E7=9A=84=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E4=BB=B7=E7=9A=84=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=202=E3=80=81=E5=90=AB=E7=A8=8E=E6=96=99=E5=8F=B7=E4=BC=B0?=
 =?UTF-8?q?=E4=BB=B7=E6=88=90=E6=9C=AC=3D=E8=AF=A5=E6=96=99=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84BOM=E7=89=A9=E6=96=99=E5=90=AB=E7=A8=8E=E6=80=BB?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=88=90=E6=9C=AC+=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E8=BF=90=E8=BE=93=E6=88=90=E6=9C=AC+=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=88=90=E6=9C=AC+=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=88=90=E6=9C=AC+(=E8=AF=A5=E6=96=99?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84BOM=E7=89=A9=E6=96=99=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=80=BB=E9=87=87=E8=B4=AD=E6=88=90=E6=9C=AC/=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E6=80=BB=E7=89=A9=E6=96=99=E6=88=90=E6=9C=AC)*?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E7=9A=84=E6=80=BB=E7=BB=8F?=
 =?UTF-8?q?=E8=90=A5=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=202.1=E3=80=81=E8=AF=A5=E6=96=99=E5=8F=B7=E7=9A=84BOM=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=90=AB=E7=A8=8E=E6=80=BB=E9=87=87=E8=B4=AD=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=3D=E6=89=8B=E5=A1=AB=E7=9A=84bom=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=9A=84=E6=80=BB=E7=9A=84=E5=90=AB=E7=A8=8E=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=8D=95=E4=BB=B7=E7=9A=84=E5=90=88=E8=AE=A1=203=E3=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E8=BF=90=E8=BE=93=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=9A=E6=89=8B=E5=A1=AB=EF=BC=88=E4=B8=9A=E5=8A=A1=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=EF=BC=89=20=E5=90=AB=E7=A8=8E=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=3D=EF=BC=881+0.13=EF=BC=89*=E4=B8=8D?=
 =?UTF-8?q?=E5=90=AB=E7=A8=8E=E8=BF=90=E8=BE=93=E6=88=90=E6=9C=AC=204?=
 =?UTF-8?q?=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=9C=8D=E5=8A=A1=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=EF=BC=9A=E6=89=8B=E5=A1=AB=EF=BC=88=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=EF=BC=89=20=E5=90=AB=E7=A8=8E=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=88=90=E6=9C=AC=3D=EF=BC=881+0.13=EF=BC=89*?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=9C=8D=E5=8A=A1=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=205=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=EF=BC=9A=E6=89=8B=E5=A1=AB=EF=BC=88=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=A1=AB=E5=86=99=EF=BC=89=20=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=88=90=E6=9C=AC=3D=EF=BC=881+0.13=EF=BC=89?=
 =?UTF-8?q?*=E4=B8=8D=E5=90=AB=E7=A8=8E=E5=BC=80=E5=8F=91=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=206.1=E3=80=81=E8=AF=A5=E6=96=99=E5=8F=B7=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?(RMB)=3D(=E8=AF=A5=E6=96=99=E5=8F=B7=E7=9A=84BOM=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC/=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E6=80=BB=E7=89=A9=E6=96=99=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E5=90=88=E8=AE=A1)*=E4=B8=8A=E4=B8=80=E5=B9=B4?=
 =?UTF-8?q?=E5=BA=A6=E7=9A=84=E6=80=BB=E7=BB=8F=E8=90=A5=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=206.1.1=E3=80=81?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E7=9A=84=E6=80=BB=E7=BB=8F?=
 =?UTF-8?q?=E8=90=A5=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=9A=E6=89=8B=E5=A1=AB=EF=BC=88=E6=80=BB=E7=BB=8F?=
 =?UTF-8?q?=E7=90=86=E5=A1=AB=EF=BC=89=206.1.2=E3=80=81=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=80=BB=E7=89=A9=E6=96=99=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=EF=BC=9A=E6=89=8B?=
 =?UTF-8?q?=E5=A1=AB=EF=BC=88=E6=80=BB=E7=BB=8F=E7=90=86=E5=A1=AB=EF=BC=89?=
 =?UTF-8?q?=207.1=E3=80=81=E8=AF=A5=E6=96=99=E5=8F=B7=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC(RMB)=3D(=E8=AF=A5=E6=96=99?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84BOM=E7=89=A9=E6=96=99=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=80=BB=E9=87=87=E8=B4=AD=E6=88=90=E6=9C=AC/=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E5=B9=B4=E5=BA=A6=E6=80=BB=E7=89=A9=E6=96=99=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1)*=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E5=B9=B4=E5=BA=A6=E7=9A=84=E6=80=BB=E7=BB=8F=E8=90=A5?=
 =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=207.1.1?=
 =?UTF-8?q?=E3=80=81=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E7=9A=84=E6=80=BB?=
 =?UTF-8?q?=E7=BB=8F=E8=90=A5=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=9A=EF=BC=881+0.13=EF=BC=89*=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E7=9A=84=E6=80=BB=E7=BB=8F=E8=90=A5=E4=B8=8D?=
 =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=207.1.2?=
 =?UTF-8?q?=E3=80=81=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E6=80=BB=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=9A=EF=BC=881+0.13=EF=BC=89*=E4=B8=8A=E4=B8=80=E5=B9=B4?=
 =?UTF-8?q?=E5=BA=A6=E6=80=BB=E7=89=A9=E6=96=99=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=208=E3=80=81=E8=A2=AB?=
 =?UTF-8?q?=E4=BC=B0=E4=BB=B7=E7=89=A9=E6=96=99=E7=9A=84=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E5=8D=95=E4=BB=B7=EF=BC=88RMB=EF=BC=89=3D=E8=A2=AB?=
 =?UTF-8?q?=E4=BC=B0=E4=BB=B7=E7=89=A9=E6=96=99=E7=9A=84=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E6=80=BB=E6=88=90=E6=9C=AC/=EF=BC=881-=E5=88=A9?=
 =?UTF-8?q?=E6=B6=A6=E7=8E=87=EF=BC=89=209=E3=80=81=E8=A2=AB=E4=BC=B0?=
 =?UTF-8?q?=E4=BB=B7=E7=89=A9=E6=96=99=E7=9A=84=E5=90=AB=E7=A8=8E=E5=8D=95?=
 =?UTF-8?q?=E4=BB=B7(RMB)=3D=E8=A2=AB=E4=BC=B0=E4=BB=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=9A=84=E5=90=AB=E7=A8=8E=E6=80=BB=E6=88=90=E6=9C=AC/?=
 =?UTF-8?q?=EF=BC=881-=E5=88=A9=E6=B6=A6=E7=8E=87=EF=BC=89=2010=E3=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(RMB)=3D=E8=A2=AB?=
 =?UTF-8?q?=E4=BC=B0=E4=BB=B7=E7=89=A9=E6=96=99=E7=9A=84=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E5=8D=95=E4=BB=B7(RMB)*=E6=95=B0=E9=87=8F=2011?=
 =?UTF-8?q?=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(RMB)=3D=E8=A2=AB?=
 =?UTF-8?q?=E4=BC=B0=E4=BB=B7=E7=89=A9=E6=96=99=E7=9A=84=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E5=8D=95=E4=BB=B7(RMB)*=E6=95=B0=E9=87=8F=2012=E3=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(=E7=BE=8E?=
 =?UTF-8?q?=E5=85=83)=3D=E8=A2=AB=E4=BC=B0=E4=BB=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(RMB)/?=
 =?UTF-8?q?=E7=BE=8E=E5=85=83=E6=B1=87=E7=8E=87=20=E6=B3=A8:=E6=8D=A2?=
 =?UTF-8?q?=E7=AE=97=E5=90=8E=EF=BC=8C=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E7=82=B9=E5=90=8E=E4=B8=A4=E4=BD=8D=EF=BC=8C=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5=2013?=
 =?UTF-8?q?=E3=80=81=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(=E7=BE=8E?=
 =?UTF-8?q?=E5=85=83)=3D=E4=B8=8D=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(?=
 =?UTF-8?q?=E7=BE=8E=E5=85=83)=2014=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=E6=80=BB=E4=BB=B7(=E7=BE=8E=E5=85=83)=3D=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E5=8D=95=E4=BB=B7(=E7=BE=8E=E5=85=83)*=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=2015=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(?=
 =?UTF-8?q?=E7=BE=8E=E5=85=83)=3D=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(?=
 =?UTF-8?q?=E7=BE=8E=E5=85=83)*=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalesEstimateServiceImpl.java        | 132 +++++++++------
 .../templates/sales/estimate/ceoAdd.html      |  30 +++-
 .../sales/estimate/ceoAddDetail.html          | 156 +++++++++---------
 3 files changed, 182 insertions(+), 136 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
index 764f3d23..13e5f09e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
@@ -300,28 +300,48 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
 
 
     /*   下面的计算规则
-1、不含税总经营成本=不含税人工成本+不含税推广成本+不含税业务成本+不含税管理成本
-2、含税总经营成本=不含税总经营成本*(1+0.13)
-3、不含税经营成本(RMB)=(该料号的BOM物料总不含税采购成本/总不含税物料成本)*总不含税经营成本
-4、含税经营成本(RMB)=(该料号的BOM物料总含税采购成本/总含税物料成本)*总含税经营成本
-5、不含税料号估价成本:该料号的BOM物料总不含税采购成本+不含税总经营成本+(该料号的BOM物料总不含税采购成本/总不含税物料成本)*总不含税经营成本
-新版：不含税料号估价成本:该料号的BOM物料总不含税采购成本+不含税运输成本+不含税服务成本+不含税开发成本+(该料号的BOM物料总不含税采购成本/总物料不含税成本)*总经营不含税成
+1、不含税料号估价成本=该料号的BOM物料不含税总采购成本+不含税运输成本+不含税服务成本+不含税开发成本+(该料号的BOM物料不含税总采购成本/不含税总物料成本)*上一年度的总经营不含税成本合计
 
+1.1、该料号的BOM物料不含税总采购成本=手填的bom物料的总的不含税采购单价的合计
 
-6、含税料号估价成本:该料号的BOM物料总含税采购成本+含税总经营成本+(该料号的BOM物料总含税采购成本/总含税物料成本)*总含税经营成本
-新版：含税料号估价成本:该料号的BOM物料总含税采购成本+含税运输成本+含税服务成本+含税开发成本+(该料号的BOM物料总含税采购成本/总物料含税成本)*总经营含税成本
+2、含税料号估价成本=该料号的BOM物料含税总采购成本+含税运输成本+含税服务成本+含税开发成本+(该料号的BOM物料含税总采购成本/含税总物料成本)*上一年度的总经营含税成本合计
 
+2.1、该料号的BOM物料含税总采购成本=手填的bom物料的总的含税采购单价的合计
 
-7、不含税单价(RMB):该料号不含税估价成本/(1-利润率)
-8、含税单价(RMB)=该料号含税估价成本/(1-利润率)
-9、不含税总价(RMB)=不含税单价(RMB)*数量
-10、含税总价(RMB)=含税单价(RMB)*数量
-11、不含税单价(美元)=不税单价(RMB)/美元汇率
+3、不含税运输成本：手填（业务填写）
+含税运输成本=（1+0.13）*不含税运输成本
+
+4、不含税服务成本：手填（业务填写）
+含税服务成本=（1+0.13）*不含税服务成本
+
+5、不含税开发成本：手填（工程填写）
+含税开发成本=（1+0.13）*不含税开发成本
+
+6.1、该料号的不含税经营成本(RMB)=(该料号的BOM物料不含税总采购成本/上一年度总物料不含税成本合计)*上一年度的总经营不含税成本合计
+6.1.1、上一年度的总经营不含税成本合计：手填（总经理填）
+6.1.2、上一年度总物料不含税成本合计：手填（总经理填）
+
+7.1、该料号含税经营成本(RMB)=(该料号的BOM物料含税总采购成本/上一年度总物料含税成本合计)*上一年度的总经营含税成本合计
+
+7.1.1、上一年度的总经营含税成本合计：（1+0.13）*上一年度的总经营不含税成本合计
+7.1.2、上一年度总物料含税成本合计：（1+0.13）*上一年度总物料不含税成本合计
+
+8、被估价物料的不含税单价（RMB）=被估价物料的不含税总成本/（1-利润率）
+
+9、被估价物料的含税单价(RMB)=被估价物料的含税总成本/（1-利润率）
+
+10、不含税总价(RMB)=被估价物料的不含税单价(RMB)*数量
+
+11、含税总价(RMB)=被估价物料的含税单价(RMB)*数量
+
+12、不含税单价(美元)=被估价物料的不含税单价(RMB)/美元汇率
 注:换算后，保留小数点后两位，超过后的四舍五入
-12、含税单价(美元)=不含税单价(美元)
-13、不含税总价(美元)=不含税单价(美元)*数量
-14、含税总价(美元)=含税单价(美元)*数量
-15、总含税物料成本 = 总不含税物料成本*(1+0.13)
+
+13、含税单价(美元)=不含税单价(美元)
+
+14、不含税总价(美元)=不含税单价(美元)*数量
+
+15、含税总价(美元)=含税单价(美元)*数量
     * */
 
 
@@ -360,25 +380,32 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
         List<SalesEstimateDetail> salesEstimateDetailList = salesEstimate.getSalesEstimateDetailList(); // 获取销售估价详情列表
 
         for (SalesEstimateDetail salesEstimateDetail : salesEstimateDetailList) { // 遍历销售估价详情列表
-            BigDecimal noTaxLaborCosts = salesEstimateDetail.getNoTaxLaborCosts(); // 获取不含税的人工成本
-            BigDecimal noTaxPromotionalCosts = salesEstimateDetail.getNoTaxPromotionalCosts(); // 获取不含税的推广成本
-            BigDecimal noTaxBusinessCosts = salesEstimateDetail.getNoTaxBusinessCosts(); // 获取不含税的业务成本
-            BigDecimal noTaxManagesCosts = salesEstimateDetail.getNoTaxManagesCosts(); // 获取不含税的管理成本
-            BigDecimal noTaxMaterialCosts = salesEstimateDetail.getNoTaxMaterialCosts(); // 获取不含税的物料成本
+//            BigDecimal noTaxLaborCosts = salesEstimateDetail.getNoTaxLaborCosts(); // 获取不含税的人工成本
+//            BigDecimal noTaxPromotionalCosts = salesEstimateDetail.getNoTaxPromotionalCosts(); // 获取不含税的推广成本
+//            BigDecimal noTaxBusinessCosts = salesEstimateDetail.getNoTaxBusinessCosts(); // 获取不含税的业务成本
+//            BigDecimal noTaxManagesCosts = salesEstimateDetail.getNoTaxManagesCosts(); // 获取不含税的管理成本
+
+            BigDecimal totalOperatingCosts = salesEstimateDetail.getTotalOperatingCosts(); //上一年度不含税总经营成本
+            BigDecimal noTaxMaterialCosts = salesEstimateDetail.getNoTaxMaterialCosts(); // 获取上一年度不含税的总物料成本
 
             BigDecimal noTaxShippingCosts = salesEstimateDetail.getNoTaxShippingCosts(); //不含税运输成本
             BigDecimal noTaxServiceCosts = salesEstimateDetail.getNoTaxServiceCosts(); //不含税服务成本
             BigDecimal noTaxDevelopmentCosts = salesEstimateDetail.getNoTaxDevelopCosts();//不含税开发成本
 
+
+            BigDecimal taxShippingCosts = salesEstimateDetail.getNoTaxShippingCosts().multiply(BigDecimal.valueOf(1.13)) ; //含税运输成本
+            BigDecimal taxServiceCosts = salesEstimateDetail.getNoTaxServiceCosts().multiply(BigDecimal.valueOf(1.13)); //含税服务成本
+            BigDecimal taxDevelopmentCosts = salesEstimateDetail.getNoTaxDevelopCosts().multiply(BigDecimal.valueOf(1.13));//含税开发成本
+
             BigDecimal profitRate = salesEstimateDetail.getProfitRate().divide(BigDecimal.valueOf(100)); // 获取利润率并转换为小数形式
             Long materialNum = salesEstimateDetail.getMaterialNum(); // 获取物料数量
 
-            // 计算不含税总经营成本
-            BigDecimal noAllTaxOperatingCosts = calculateNoTaxOperatingCosts(
-                    noTaxLaborCosts, noTaxPromotionalCosts, noTaxBusinessCosts, noTaxManagesCosts);
+//            // 计算不含税总经营成本
+//            BigDecimal noAllTaxOperatingCosts = calculateNoTaxOperatingCosts(
+//                    noTaxLaborCosts, noTaxPromotionalCosts, noTaxBusinessCosts, noTaxManagesCosts);
 
-            // 计算含税总经营成本
-            BigDecimal allTaxOperatingCosts = calculateTaxOperatingCosts(noAllTaxOperatingCosts);
+            // 计算上一年度含税总经营成本
+            BigDecimal allTaxOperatingCosts = calculateTaxOperatingCosts(totalOperatingCosts);
 
             // 计算总含税物料成本
             BigDecimal taxMaterialCosts = calculateTaxMaterialCosts(noTaxMaterialCosts);
@@ -389,18 +416,18 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
             // 计算物料总含税采购成本
             BigDecimal totalTaxPurchaseRmb = calculateTotalTaxPurchaseRmb(estimateDetailMaterialList);
 
-            // 计算不含税经营成本(RMB)，并保留两位小数
-            BigDecimal noTaxOperatingCost = calculateNoTaxOperatingCost(totalNoTaxPurchaseRmb, noTaxMaterialCosts, noAllTaxOperatingCosts)
+            // 计算该料号的不含税经营成本(RMB)，并保留两位小数
+            BigDecimal noTaxOperatingCost = calculateNoTaxOperatingCost(totalNoTaxPurchaseRmb, noTaxMaterialCosts, totalOperatingCosts)
                     .setScale(2, RoundingMode.HALF_UP);
-            // 计算含税经营成本(RMB)，并保留两位小数
+            // 计算该料号含税经营成本(RMB)，并保留两位小数
             BigDecimal taxOperatingCost = calculateTaxOperatingCost(totalTaxPurchaseRmb, taxMaterialCosts, allTaxOperatingCosts)
                     .setScale(2, RoundingMode.HALF_UP);
 
-            // 计算不含税料号估价成本，并保留两位小数
-            BigDecimal noTaxEstimateCost = calculateNoTaxEstimateCost(totalNoTaxPurchaseRmb, noTaxShippingCosts,noTaxServiceCosts,noTaxDevelopmentCosts,noAllTaxOperatingCosts, noTaxMaterialCosts)
+            // 计算该料号的不含税料号估价成本，并保留两位小数
+            BigDecimal noTaxEstimateCost = calculateNoTaxEstimateCost(totalNoTaxPurchaseRmb, noTaxShippingCosts,noTaxServiceCosts,noTaxDevelopmentCosts,noTaxOperatingCost)
                     .setScale(2, RoundingMode.HALF_UP);
-            // 计算含税料号估价成本，并保留两位小数
-            BigDecimal taxEstimateCost = calculateTaxEstimateCost(totalTaxPurchaseRmb,noTaxShippingCosts,noTaxServiceCosts,noTaxDevelopmentCosts, allTaxOperatingCosts, taxMaterialCosts)
+            // 计算该料号的含税料号估价成本，并保留两位小数
+            BigDecimal taxEstimateCost = calculateTaxEstimateCost(totalTaxPurchaseRmb,taxShippingCosts,taxServiceCosts,taxDevelopmentCosts, allTaxOperatingCosts)
                     .setScale(2, RoundingMode.HALF_UP);
 
             // 计算不含税单价(RMB)，并保留两位小数
@@ -434,8 +461,11 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
             noTaxDollarMain = noTaxDollarMain.add(noTaxUnitPriceDollar);
 
             // 计算含税单价(美元)，并保留两位小数
-            BigDecimal taxUnitPriceDollar = calculateTaxUnitPriceDollar(taxUnitPriceRmb, usdRate)
-                    .setScale(2, RoundingMode.HALF_UP);
+//            BigDecimal taxUnitPriceDollar = calculateTaxUnitPriceDollar(taxUnitPriceRmb, usdRate)
+//                    .setScale(2, RoundingMode.HALF_UP);
+            BigDecimal taxUnitPriceDollar = noTaxUnitPriceDollar;
+
+
             // 计算主表的含税单价美元
             taxDollarMain = taxDollarMain.add(taxUnitPriceDollar);
 
@@ -499,8 +529,8 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
         BigDecimal totalNoTaxPurchaseRmb = BigDecimal.ZERO;
         for (SalesEstimateDetailMaterial detailMaterial : estimateDetailMaterialList) {
             BigDecimal noTaxPurchaseRmb = detailMaterial.getNoTaxPurchaseRmb(); // 获取不含税采购单价
-            Long useNum = detailMaterial.getUseNum(); // 获取用量
-            totalNoTaxPurchaseRmb = totalNoTaxPurchaseRmb.add(noTaxPurchaseRmb.multiply(new BigDecimal(useNum))); // 计算总不含税采购成本
+            //Long useNum = detailMaterial.getUseNum(); // 获取用量
+            totalNoTaxPurchaseRmb = totalNoTaxPurchaseRmb.add(noTaxPurchaseRmb); // 计算总不含税采购成本
         }
         return totalNoTaxPurchaseRmb;
     }
@@ -510,16 +540,16 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
         BigDecimal totalTaxPurchaseRmb = BigDecimal.ZERO;
         for (SalesEstimateDetailMaterial detailMaterial : estimateDetailMaterialList) {
             BigDecimal taxPurchaseRmb = detailMaterial.getTaxPurchaseRmb(); // 获取含税采购单价
-            Long useNum = detailMaterial.getUseNum(); // 获取用量
-            totalTaxPurchaseRmb = totalTaxPurchaseRmb.add(taxPurchaseRmb.multiply(new BigDecimal(useNum))); // 计算总含税采购成本
+           // Long useNum = detailMaterial.getUseNum(); // 获取用量
+            totalTaxPurchaseRmb = totalTaxPurchaseRmb.add(taxPurchaseRmb); // 计算总含税采购成本
         }
         return totalTaxPurchaseRmb;
     }
 
-    // 计算不含税经营成本(RMB)
-    private BigDecimal calculateNoTaxOperatingCost(BigDecimal totalNoTaxPurchaseRmb, BigDecimal noTaxMaterialCosts, BigDecimal noAllTaxOperatingCosts) {
+    // 计算该料号的不含税经营成本(RMB)
+    private BigDecimal calculateNoTaxOperatingCost(BigDecimal totalNoTaxPurchaseRmb, BigDecimal noTaxMaterialCosts, BigDecimal totalOperatingCosts) {
         return totalNoTaxPurchaseRmb.divide(noTaxMaterialCosts, 2, RoundingMode.HALF_UP)
-                .multiply(noAllTaxOperatingCosts);
+                .multiply(totalOperatingCosts);
     }
 
     // 计算含税经营成本(RMB)
@@ -531,23 +561,21 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
     // 计算不含税料号估价成本                BigDecimal noTaxShippingCosts = salesEstimateDetail.getNoTaxShippingCosts(); //不含税运输成本
     //            BigDecimal noTaxServiceCosts = salesEstimateDetail.getNoTaxServiceCosts(); //不含税服务成本
     //            BigDecimal noTaxDevelopmentCosts = salesEstimateDetail.getNoTaxDevelopCosts();//不含税开发成本
-    private BigDecimal calculateNoTaxEstimateCost(BigDecimal totalNoTaxPurchaseRmb, BigDecimal noTaxShippingCosts  ,BigDecimal noTaxServiceCosts,BigDecimal noTaxDevelopmentCosts ,BigDecimal noAllTaxOperatingCosts,BigDecimal noTaxMaterialCosts) {
+    private BigDecimal calculateNoTaxEstimateCost(BigDecimal totalNoTaxPurchaseRmb, BigDecimal noTaxShippingCosts  ,BigDecimal noTaxServiceCosts,BigDecimal noTaxDevelopmentCosts ,BigDecimal noTaxOperatingCost) {
         return totalNoTaxPurchaseRmb
                 .add(noTaxShippingCosts)
                 .add(noTaxServiceCosts)
                 .add(noTaxDevelopmentCosts)
-                .add(totalNoTaxPurchaseRmb.divide(noTaxMaterialCosts, 2, RoundingMode.HALF_UP)
-                        .multiply(noAllTaxOperatingCosts));
+                .add(noTaxOperatingCost);
     }
 
     // 计算含税料号估价成本
-    private BigDecimal calculateTaxEstimateCost(BigDecimal totalTaxPurchaseRmb, BigDecimal noTaxShippingCosts  ,BigDecimal noTaxServiceCosts,BigDecimal noTaxDevelopmentCosts ,BigDecimal allTaxOperatingCosts, BigDecimal taxMaterialCosts) {
+    private BigDecimal calculateTaxEstimateCost(BigDecimal totalTaxPurchaseRmb, BigDecimal taxShippingCosts  ,BigDecimal taxServiceCosts,BigDecimal taxDevelopmentCosts ,BigDecimal allTaxOperatingCosts) {
         return totalTaxPurchaseRmb
-                .add(noTaxShippingCosts)
-                .add(noTaxServiceCosts)
-                .add(noTaxDevelopmentCosts)
-                .add(totalTaxPurchaseRmb.divide(taxMaterialCosts, 2, RoundingMode.HALF_UP)
-                        .multiply(allTaxOperatingCosts));
+                .add(taxShippingCosts)
+                .add(taxServiceCosts)
+                .add(taxDevelopmentCosts)
+                .add(allTaxOperatingCosts);
     }
 
     // 计算不含税单价(RMB)
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
index e92a1b4a..4e350c59 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
@@ -132,6 +132,7 @@
                     "noTaxDevelopCosts": null, // 初始化为 null 或 0
                     "noTaxShippingCosts": null,
                     "noTaxServiceCosts": null,
+                    "totalOperatingCosts": null,
                     "noTaxMaterialCosts": null,
                     "noTaxOperatingCosts": null,
                     "taxOperatingCosts": null,
@@ -145,6 +146,7 @@
                 var noTaxDevelopCosts = $('#noTaxDevelopCosts' + index).val();
                 var noTaxShippingCosts = $('#noTaxShippingCosts' + index).val();
                 var noTaxServiceCosts = $('#noTaxServiceCosts' + index).val();
+                var totalOperatingCosts = $('#totalOperatingCosts' + index).val();
                 var noTaxMaterialCosts = $('#noTaxMaterialCosts' + index).val();
                 var noTaxOperatingCosts = $('#noTaxOperatingCosts' + index).val();
                 var taxOperatingCosts = $('#taxOperatingCosts' + index).val();
@@ -166,18 +168,23 @@
                     hasError = true;
                     return; // 退出循环，阻止进一步处理
                 }
+                if (!totalOperatingCosts && totalOperatingCosts !== '0') {
+                    $.modal.alertWarning("不含税总经营成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的不含税总经营成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
                 if (!noTaxMaterialCosts && noTaxMaterialCosts !== '0') {
-                    $.modal.alertWarning("物料成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的物料成本");
+                    $.modal.alertWarning("不含税物料成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的不含税物料成本");
                     hasError = true;
                     return; // 退出循环，阻止进一步处理
                 }
                 if (!noTaxOperatingCosts && noTaxOperatingCosts !== '0') {
-                    $.modal.alertWarning("经营成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的经营成本");
+                    $.modal.alertWarning("不含税经营成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的不含税经营成本");
                     hasError = true;
                     return; // 退出循环，阻止进一步处理
                 }
                 if (!taxOperatingCosts && taxOperatingCosts !== '0') {
-                    $.modal.alertWarning("税经营成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的税经营成本");
+                    $.modal.alertWarning("含税经营成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的含税经营成本");
                     hasError = true;
                     return; // 退出循环，阻止进一步处理
                 }
@@ -191,6 +198,7 @@
                 estimateMaterialDataList[index].noTaxDevelopCosts = noTaxDevelopCosts;
                 estimateMaterialDataList[index].noTaxShippingCosts = noTaxShippingCosts;
                 estimateMaterialDataList[index].noTaxServiceCosts = noTaxServiceCosts;
+                estimateMaterialDataList[index].totalOperatingCosts = totalOperatingCosts;
                 estimateMaterialDataList[index].noTaxMaterialCosts = noTaxMaterialCosts;
                 estimateMaterialDataList[index].noTaxOperatingCosts = noTaxOperatingCosts;
                 estimateMaterialDataList[index].taxOperatingCosts = taxOperatingCosts;
@@ -510,6 +518,8 @@
                     const taxOperatingCosts = (
                         (taxPurchaseRmb/allTaxMaterialCosts) * allTaxOperatingCosts
                     ).toFixed(2) || '';
+
+
                     // 根据 `parentRow.profitRate` 设置利润率
                     let profitRateKey = 'aprofitRate';
                     switch (parentRow.profitRate) {
@@ -651,8 +661,11 @@
                     // 遍历数据集计算不含税采购成本和含税采购成本
                     data.forEach(function(item) {
                         item.rows.forEach(function(row) {
-                            var noTaxPurchaseRmb = row.noTaxPurchaseRmb * row.useNum;
-                            var taxPurchaseRmb = row.taxPurchaseRmb * row.useNum;
+                            // var noTaxPurchaseRmb = row.noTaxPurchaseRmb * row.useNum;
+                            // var taxPurchaseRmb = row.taxPurchaseRmb * row.useNum;
+
+                            var noTaxPurchaseRmb = row.noTaxPurchaseRmb;
+                            var taxPurchaseRmb = row.taxPurchaseRmb;
 
                             allNoTaxPurchaseRmb += noTaxPurchaseRmb;
                             allTaxPurchaseRmb += taxPurchaseRmb;
@@ -681,8 +694,11 @@
                     // 遍历数据集计算不含税采购成本和含税采购成本
                     data.forEach(function(item) {
                         item.rows.forEach(function(row) {
-                            var noTaxPurchaseRmb = row.noTaxPurchaseRmb * row.useNum;
-                            var taxPurchaseRmb = row.taxPurchaseRmb * row.useNum;
+                            // var noTaxPurchaseRmb = row.noTaxPurchaseRmb * row.useNum;
+                            // var taxPurchaseRmb = row.taxPurchaseRmb * row.useNum;
+
+                            var noTaxPurchaseRmb = row.noTaxPurchaseRmb;
+                            var taxPurchaseRmb = row.taxPurchaseRmb;
 
                             allNoTaxPurchaseRmb += noTaxPurchaseRmb;
                             allTaxPurchaseRmb += taxPurchaseRmb;
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html
index a9dc3d0c..087c8032 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html
@@ -354,33 +354,33 @@
 
           // 从 `salesEstimateDetailVo` 中获取其他成本信息
           const {
-            noTaxLaborCosts = '',
-            noTaxPromotionalCosts = '',
-            noTaxBusinessCosts = '',
-            noTaxManagesCosts = '',
-            noTaxMaterialCosts = ''
+            totalOperatingCosts = '', //上一年度的总经营不含税成本合计
+            noTaxMaterialCosts = ''  // 上一年度总物料不含税成本合计
           } = salesEstimateDetailVo || {};
 
-          // 计算不含税总经营成本
-          const noAllTaxOperatingCosts = (
-                  parseFloat(noTaxLaborCosts) +
-                  parseFloat(noTaxBusinessCosts) +
-                  parseFloat(noTaxManagesCosts) +
-                  parseFloat(noTaxPromotionalCosts)
+          // 计算上一年度含税总经营成本，假设增值税率为 13%
+          const allTaxOperatingCosts = (
+                  parseFloat(totalOperatingCosts) * 1.13
           ).toFixed(2) || '';
 
-          // 计算含税总经营成本，假设增值税率为 13%
-          const allTaxOperatingCosts = (
-                  parseFloat(noAllTaxOperatingCosts) * 1.13
+          //上一年度总物料含税成本合计
+          const allTaxMaterialCosts = (
+                  parseFloat(noTaxMaterialCosts) * 1.13
           ).toFixed(2) || '';
-          //该料号的不含税经营成本
+
+
+          //该料号的不含税经营成本 (RMB)=(该料号的BOM物料不含税总采购成本/上一年度总物料不含税成本合计)*上一年度的总经营不含税成本合计
           const noTaxOperatingCosts = (
-                  (noTaxPurchaseRmb/noTaxMaterialCosts) * noAllTaxOperatingCosts
+                  (noTaxPurchaseRmb/noTaxMaterialCosts) * totalOperatingCosts
           ).toFixed(2) || '';
-          // 该料号的含税经营成本
+
+
+          // 该料号的含税经营成本 (RMB)=(该料号的BOM物料含税总采购成本/上一年度总物料含税成本合计)*上一年度的总经营含税成本合计
           const taxOperatingCosts = (
-                  (taxPurchaseRmb/noTaxMaterialCosts) * allTaxOperatingCosts
+                  (taxPurchaseRmb/allTaxMaterialCosts) * allTaxOperatingCosts
           ).toFixed(2) || '';
+
+
           // 根据 `parentRow.profitRate` 设置利润率
           let profitRateKey = 'aprofitRate';
           switch (parentRow.profitRate) {
@@ -409,10 +409,7 @@
             noTaxDevelopCosts,
             noTaxShippingCosts,
             noTaxServiceCosts,
-            noTaxLaborCosts,
-            noTaxPromotionalCosts,
-            noTaxBusinessCosts,
-            noTaxManagesCosts,
+            totalOperatingCosts,
             noTaxMaterialCosts,
             noTaxOperatingCosts,
             taxOperatingCosts,
@@ -427,10 +424,7 @@
             noTaxDevelopCosts: '',
             noTaxShippingCosts: '',
             noTaxServiceCosts: '',
-            noTaxLaborCosts: '',
-            noTaxPromotionalCosts: '',
-            noTaxBusinessCosts: '',
-            noTaxManagesCosts: '',
+            totalOperatingCosts: '',
             noTaxMaterialCosts: '',
             noTaxOperatingCosts: '',
             taxOperatingCosts: '',
@@ -453,24 +447,12 @@
         formHtml += '<label for="noTaxServiceCosts' + index + '">不含税服务成本(RMB):</label>';
         formHtml += '<input type="text" class="form-control" id="noTaxServiceCosts' + index + '" name="noTaxServiceCosts' + index + '" value="' + costs.noTaxServiceCosts + '" readonly>';
         formHtml += '</div>';
-        formHtml += '<h3>总经营成本</h3>';
+        formHtml += '<h3>上一年度总经营成本</h3>';
         formHtml += '<div class="form-group">';
-        formHtml += '<label for="noTaxLaborCosts' + index + '">不含税人工成本(RMB):</label>';
-        formHtml += '<input type="text" class="form-control" id="noTaxLaborCosts' + index + '" name="noTaxLaborCosts' + index + '" value="' + costs.noTaxLaborCosts + '" readonly>';
+        formHtml += '<label for="totalOperatingCosts' + index + '">不含税总经营成本(RMB):</label>';
+        formHtml += '<input type="text" class="form-control" id="totalOperatingCosts' + index + '" name="totalOperatingCosts' + index + '" value="' + costs.totalOperatingCosts + '" readonly>';
         formHtml += '</div>';
-        formHtml += '<div class="form-group">';
-        formHtml += '<label for="noTaxPromotionalCosts' + index + '">不含税推广成本(RMB):</label>';
-        formHtml += '<input type="text" class="form-control" id="noTaxPromotionalCosts' + index + '" name="noTaxPromotionalCosts' + index + '" value="' + costs.noTaxPromotionalCosts + '" readonly>';
-        formHtml += '</div>';
-        formHtml += '<div class="form-group">';
-        formHtml += '<label for="noTaxBusinessCosts' + index + '">不含税业务成本(RMB):</label>';
-        formHtml += '<input type="text" class="form-control" id="noTaxBusinessCosts' + index + '" name="noTaxBusinessCosts' + index + '" value="' + costs.noTaxBusinessCosts + '" readonly>';
-        formHtml += '</div>';
-        formHtml += '<div class="form-group">';
-        formHtml += '<label for="noTaxManagesCosts' + index + '">不含税管理成本(RMB):</label>';
-        formHtml += '<input type="text" class="form-control" id="noTaxManagesCosts' + index + '" name="noTaxManagesCosts' + index + '" value="' + costs.noTaxManagesCosts + '" readonly>';
-        formHtml += '</div>';
-        formHtml += '<h3>总物料成本</h3>';
+        formHtml += '<h3>上一年度总物料成本</h3>';
         formHtml += '<div class="form-group">';
         formHtml += '<label for="noTaxMaterialCosts' + index + '">不含税总物料成本(RMB):</label>';
         formHtml += '<input type="text" class="form-control" id="noTaxMaterialCosts' + index + '" name="noTaxMaterialCosts' + index + '" value="' + costs.noTaxMaterialCosts + '" readonly>';
@@ -506,17 +488,8 @@
 
           // 根据 input 的 id 或 name 进行相应的计算
           switch (inputId) {
-            case 'noTaxLaborCosts' + index:
-              calculateOperatingCosts(inputValue, 'noTaxLaborCosts');
-              break;
-            case 'noTaxPromotionalCosts' + index:
-              calculateOperatingCosts(inputValue, 'noTaxPromotionalCosts');
-              break;
-            case 'noTaxBusinessCosts' + index:
-              calculateOperatingCosts(inputValue, 'noTaxBusinessCosts');
-              break;
-            case 'noTaxManagesCosts' + index:
-              calculateOperatingCosts(inputValue, 'noTaxManagesCosts');
+            case 'totalOperatingCosts' + index:
+              calculateOperatingCosts(inputValue, 'totalOperatingCosts');
               break;
             case 'noTaxMaterialCosts' + index:
               updateMaterialCosts(inputValue);
@@ -529,41 +502,47 @@
         });
 
         function calculateOperatingCosts(value, costType) {
-          var noAllTaxOperatingCosts = 0;
+          // var totalOperatingCosts = 0;
           var allNoTaxPurchaseRmb = 0;
           var allTaxPurchaseRmb = 0;
 
-          // 获取所有相关的不含税成本
-          ['noTaxLaborCosts', 'noTaxPromotionalCosts', 'noTaxBusinessCosts', 'noTaxManagesCosts'].forEach(function(cost) {
-            var currentCost = parseFloat($form.find('#' + cost + index).val());
-            noAllTaxOperatingCosts += currentCost;
-          });
+          // // 获取所有相关的不含税成本
+          // ['noTaxLaborCosts', 'noTaxPromotionalCosts', 'noTaxBusinessCosts', 'noTaxManagesCosts'].forEach(function(cost) {
+          //     var currentCost = parseFloat($form.find('#' + cost + index).val());
+          //     noAllTaxOperatingCosts += currentCost;
+          // });
 
-          // 更新不含税总经营成本
-          $form.find('#noAllTaxOperatingCosts' + index).val(noAllTaxOperatingCosts.toFixed(2));
+          // 更新上一年度不含税总经营成本
+          var totalOperatingCosts = parseFloat($form.find('#totalOperatingCosts' + index).val());
 
-          // 计算含税总经营成本
-          var allTaxOperatingCosts = noAllTaxOperatingCosts * 1.13;
+          // 计算上一年度含税总经营成本
+          var allTaxOperatingCosts = totalOperatingCosts * 1.13;
           $form.find('#allTaxOperatingCosts' + index).val(allTaxOperatingCosts.toFixed(2));
 
           // 遍历数据集计算不含税采购成本和含税采购成本
           data.forEach(function(item) {
             item.rows.forEach(function(row) {
-              var noTaxPurchaseRmb = row.noTaxPurchaseRmb * row.useNum;
-              var taxPurchaseRmb = row.taxPurchaseRmb * row.useNum;
+              // var noTaxPurchaseRmb = row.noTaxPurchaseRmb * row.useNum;
+              // var taxPurchaseRmb = row.taxPurchaseRmb * row.useNum;
+
+              var noTaxPurchaseRmb = row.noTaxPurchaseRmb;
+              var taxPurchaseRmb = row.taxPurchaseRmb;
 
               allNoTaxPurchaseRmb += noTaxPurchaseRmb;
               allTaxPurchaseRmb += taxPurchaseRmb;
             });
           });
 
-          // 该料号的不含税经营成本
-          var noTaxMaterialCosts = parseFloat($form.find('#noTaxMaterialCosts' + index).val());
-          var noTaxOperatingCosts = (allNoTaxPurchaseRmb / noTaxMaterialCosts) * noAllTaxOperatingCosts;
+
+          var noTaxMaterialCosts = parseFloat($form.find('#noTaxMaterialCosts' + index).val());//不含税总物料成本
+          var allTaxMaterialCosts = noTaxMaterialCosts * 1.13;//含税总物料成本
+
+          // 该料号的不含税经营成本(RMB)=(该料号的BOM物料不含税总采购成本/上一年度总物料不含税成本合计)*上一年度的总经营不含税成本合计
+          var noTaxOperatingCosts = (allNoTaxPurchaseRmb / noTaxMaterialCosts) * totalOperatingCosts;
           $form.find('#noTaxOperatingCosts' + index).val(noTaxOperatingCosts.toFixed(2));
 
-          // 该料号的含税经营成本
-          var taxOperatingCosts = (allTaxPurchaseRmb / noTaxMaterialCosts) * allTaxOperatingCosts;
+          // 该料号含税经营成本(RMB)=(该料号的BOM物料含税总采购成本/上一年度总物料含税成本合计)*上一年度的总经营含税成本合计
+          var taxOperatingCosts = (allTaxPurchaseRmb / allTaxMaterialCosts) * allTaxOperatingCosts;
           $form.find('#taxOperatingCosts' + index).val(taxOperatingCosts.toFixed(2));
         }
 
@@ -576,23 +555,46 @@
           // 遍历数据集计算不含税采购成本和含税采购成本
           data.forEach(function(item) {
             item.rows.forEach(function(row) {
-              var noTaxPurchaseRmb = row.noTaxPurchaseRmb * row.useNum;
-              var taxPurchaseRmb = row.taxPurchaseRmb * row.useNum;
+              // var noTaxPurchaseRmb = row.noTaxPurchaseRmb * row.useNum;
+              // var taxPurchaseRmb = row.taxPurchaseRmb * row.useNum;
+
+              var noTaxPurchaseRmb = row.noTaxPurchaseRmb;
+              var taxPurchaseRmb = row.taxPurchaseRmb;
 
               allNoTaxPurchaseRmb += noTaxPurchaseRmb;
               allTaxPurchaseRmb += taxPurchaseRmb;
             });
           });
 
-          // 更新不含税经营成本
-          var noAllTaxOperatingCosts = parseFloat($form.find('#noAllTaxOperatingCosts' + index).val());
-          var noTaxOperatingCosts = (noTaxPurchaseRmb / value) * noAllTaxOperatingCosts;
+          // // 更新不含税经营成本
+          // var noAllTaxOperatingCosts = parseFloat($form.find('#noAllTaxOperatingCosts' + index).val());
+          // var noTaxOperatingCosts = (noTaxPurchaseRmb / value) * noAllTaxOperatingCosts;
+          // $form.find('#noTaxOperatingCosts' + index).val(noTaxOperatingCosts.toFixed(2));
+          //
+          // // 更新含税经营成本
+          // var taxOperatingCosts = (taxPurchaseRmb / value) * noAllTaxOperatingCosts;
+          // $form.find('#taxOperatingCosts' + index).val(taxOperatingCosts.toFixed(2));
+
+          // 更新上一年度不含税总经营成本
+          var totalOperatingCosts = parseFloat($form.find('#totalOperatingCosts' + index).val());
+
+          // 计算上一年度含税总经营成本
+          var allTaxOperatingCosts = totalOperatingCosts * 1.13;
+          $form.find('#allTaxOperatingCosts' + index).val(allTaxOperatingCosts.toFixed(2));
+
+          // 该料号的不含税经营成本(RMB)=(该料号的BOM物料不含税总采购成本/上一年度总物料不含税成本合计)*上一年度的总经营不含税成本合计
+          var noTaxMaterialCosts = parseFloat($form.find('#noTaxMaterialCosts' + index).val());
+          var allTaxMaterialCosts = noTaxMaterialCosts * 1.13;
+          var noTaxOperatingCosts = (allNoTaxPurchaseRmb / noTaxMaterialCosts) * totalOperatingCosts;
           $form.find('#noTaxOperatingCosts' + index).val(noTaxOperatingCosts.toFixed(2));
 
-          // 更新含税经营成本
-          var taxOperatingCosts = (taxPurchaseRmb / value) * noAllTaxOperatingCosts;
+          // 该料号含税经营成本(RMB)=(该料号的BOM物料含税总采购成本/上一年度总物料含税成本合计)*上一年度的总经营含税成本合计
+          var taxOperatingCosts = (allTaxPurchaseRmb / allTaxMaterialCosts) * allTaxOperatingCosts;
           $form.find('#taxOperatingCosts' + index).val(taxOperatingCosts.toFixed(2));
+
+
         }
+
       }
     });
 

From ce973236830bf74f725867d4536d615844c968ee Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 2 Dec 2024 17:59:08 +0800
Subject: [PATCH 03/10] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=20=E9=94=80=E5=94=AE=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95=E5=AF=BC=E5=87=BA=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=AE=9E=E4=BD=93=E7=B1=BB=20=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7=E3=80=81=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81=E5=AE=A2=E6=88=B7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E3=80=81=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E3=80=81=E7=89=A9=E6=96=99=E5=9E=8B=E5=8F=B7=E3=80=81=E9=93=AD?=
 =?UTF-8?q?=E7=89=8Clogo=E3=80=81=E5=A4=87=E6=B3=A8=E3=80=81=E8=BF=BD?=
 =?UTF-8?q?=E8=B8=AA=E7=A0=81=E5=AD=97=E6=AE=B5=20=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=20=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7=E9=9B=86=E5=90=88=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E9=9B=86=E5=90=88?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=20=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9A=E6=A0=B9=E6=8D=AE=E4=B8=87=E6=9D=90?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=89=E7=85=A7=E4=BB=A5=E4=B8=8B=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=20=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E7=9A=84=E6=AF=8F=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=BA=EF=BC=8C=E4=B8=80=E4=B8=AA=E9=94=80=E5=94=AE=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E4=B8=80=E4=B8=AA=E7=94=9F=E4=BA=A7=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E4=B8=80=E4=B8=AA=E5=AE=A2=E6=88=B7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=8C=E4=B8=80=E4=B8=AA=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=B8=80=E4=B8=AA=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E3=80=82=E4=BD=86=E6=98=AF=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7=EF=BC=8C=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=E5=8F=B7=EF=BC=8C=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95=E5=8F=B7=E4=BB=96=E4=BB=AC?=
 =?UTF-8?q?=E6=98=AF=E4=B8=80=E4=B8=80=E5=AF=B9=E5=BA=94=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=A4=9A=E6=9D=A1=E7=89=A9=E6=96=99=20=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5.xlsx=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/ExportShippingInformOrderDto.java     |  23 ++++++++-
 .../system/mapper/SysMakeOrderMapper.java     |   5 ++
 .../SysSalesShippingInformServiceImpl.java    |  48 ++++++++++++++----
 .../mapper/system/SysMakeOrderMapper.xml      |   8 +++
 .../static/attachments/出货通知单.xlsx   | Bin 17779 -> 34336 bytes
 5 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInformOrderDto.java b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInformOrderDto.java
index 7339dcf1..7a6bbee6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInformOrderDto.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInformOrderDto.java
@@ -9,9 +9,30 @@ import lombok.Data;
 public class ExportShippingInformOrderDto {
 
 
+    /** 销售单号*/
+    private String salesOrderCode;
+
+    /** 生产订单号*/
+    private String makeNo;
+
+    /** 客户订单号*/
+    private String customerOrderCode;
+
+    /** 物料名称*/
     private String materialName;
 
-    private String deviceModelCode;
+    /** 物料型号*/
+    private String materialModel;
+
+    /** 物料数量*/
+    private Integer materialNum;
+
+    /** 铭牌logo*/
+    private String logo;
 
+    /** 备注*/
+    private String remark;
 
+    /** 追踪码*/
+    private String trackingCode;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java
index 2b1d3136..e464d730 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java
@@ -130,4 +130,9 @@ public interface SysMakeOrderMapper
     * */
 
     List<SysMakeOrder> selectMakeOrderByMakeNoList(List<String> makeNos);
+
+    /**
+     * 根据销售单号集合查询生产订单集合
+     * */
+    List<SysMakeOrder> selectMakeOrderListBySalesOrderCodes(List<String> salesOrderCode);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
index e83ec932..c21e726b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
@@ -1119,6 +1119,8 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
     public void exportShippingInformOrder(String outOrderCode, HttpServletResponse response) {
 
         String fileName = "出货通知单.xlsx";
+        //出货单号：CTD年月日+001三位数流水号
+        String shippingInformOrderCode = redisCache.generateBillNo("CTD");
 
         try {
             String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName);
@@ -1135,21 +1137,52 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
             insertShippingInformation(outOrderCode,shippingInformationType,shippingTemplateType,sysSalesShippingInform);
 
             String salesOrderCode = sysSalesShippingInform.getSalesOrderCode();
-            SysMakeOrder sysMakeOrder = sysMakeOrderMapper.selectMakeOrderBySaleNo(salesOrderCode);
+
+            List<String> salesOrderCodes = new ArrayList<>();
+
+            if (StringUtils.isNotEmpty(salesOrderCode)){
+                String[] splitSalesOrderCode = salesOrderCode.split(",");
+                salesOrderCodes = Arrays.asList(splitSalesOrderCode);
+            }
 
 
+            //生产订主表的数据
+            List<SysMakeOrder> sysMakeOrders = sysMakeOrderMapper.selectMakeOrderListBySalesOrderCodes(salesOrderCodes);
+
+            //获取销售订单的明细
+            List<SysSalesOrderChild> sysSalesOrderChildren = salesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes);
+
             String realFileName = sysSalesShippingInform.getSalesOrderCode() +"-"+ fileName.substring(0, fileName.lastIndexOf("."))+ ".xlsx";
             // 设置响应头，指定文件名和文件类型
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(realFileName, "UTF-8"));
             response.setContentType("application/octet-stream");
 
-            List<AfterSalesShippingDevice> salesShippingDeviceList = salesShippingDeviceMapper.selectShippingDeviceBySalesOrderCode(salesOrderCode);
+
+            Map<String, SysMakeOrder> makeOrderMap = new HashMap<>();
+
+            for (SysMakeOrder sysMakeOrder : sysMakeOrders) {
+                makeOrderMap.put(sysMakeOrder.getSaleNo(),sysMakeOrder);
+            }
+
 
             ArrayList<ExportShippingInformOrderDto> shippingInformOrderDtos = new ArrayList<>();
-            for (AfterSalesShippingDevice afterSalesShippingDevice : salesShippingDeviceList) {
+
+
+            for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) {
+
                 ExportShippingInformOrderDto shippingInformOrderDto = new ExportShippingInformOrderDto();
-                shippingInformOrderDto.setDeviceModelCode(afterSalesShippingDevice.getDeviceModelCode());
-                shippingInformOrderDto.setMaterialName(afterSalesShippingDevice.getMaterialName());
+                SysMakeOrder sysMakeOrder = makeOrderMap.get(sysSalesOrderChild.getQuoteId());
+                shippingInformOrderDto.setCustomerOrderCode(sysMakeOrder.getCustomerOderCode());
+                shippingInformOrderDto.setMakeNo(sysMakeOrder.getMakeNo());
+                shippingInformOrderDto.setSalesOrderCode(sysMakeOrder.getSaleNo());
+
+                shippingInformOrderDto.setMaterialName(sysSalesOrderChild.getMaterialName());
+                shippingInformOrderDto.setMaterialModel(sysSalesOrderChild.getMaterialModel());
+                shippingInformOrderDto.setMaterialNum(sysSalesOrderChild.getMaterialNum());
+                shippingInformOrderDto.setLogo(null);
+                shippingInformOrderDto.setRemark(null);
+                shippingInformOrderDto.setTrackingCode(null);
+
                 shippingInformOrderDtos.add(shippingInformOrderDto);
             }
 
@@ -1158,12 +1191,9 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
 
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
             String shippingDate = dateFormat.format(new Date());
-            map.put("makeNo",sysMakeOrder.getMakeNo());
-            map.put("salesOrderNumber",sysSalesShippingInform.getSalesOrderNumber());
-            map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress());
+            map.put("shippingInformOrderCode",shippingInformOrderCode);
             map.put("shippingDate",shippingDate);
             map.put("customerName",sysSalesShippingInform.getCustomerName());
-            map.put("businessMembers",sysSalesShippingInform.getBusinessMembers());
 
             ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build();
             WriteSheet sheet = EasyExcel.writerSheet().build();
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
index bb131c25..f237a36d 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
@@ -302,4 +302,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE wso.warehouse_storage_code = #{warehouseStorageCode}
     </select>
 
+    <select id="selectMakeOrderListBySalesOrderCodes" parameterType="String" resultMap="SysMakeOrderResult">
+        <include refid="selectSysMakeOrderVo"/>
+        where a.saleNo in
+        <foreach item="saleNo" collection="list" open="(" separator="," close=")">
+            #{saleNo}
+        </foreach>
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/static/attachments/出货通知单.xlsx b/ruoyi-admin/src/main/resources/static/attachments/出货通知单.xlsx
index 5fa20c7e978ef1fca73ce774f115f16def9436a8..078bc21271271fd5bc92c935267bee6f78d79342 100644
GIT binary patch
delta 26382
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

delta 9537
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
U11#L13W#6Ns#mE}_|MaS0iDW?yZ`_I


From 0dc7652f2fce2d7963ba4e7f6a145918a0f0f462 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 3 Dec 2024 09:13:29 +0800
Subject: [PATCH 04/10] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4:=20=E9=87=8D=E5=86=99=E5=AF=BC=E5=87=BA=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=951=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=20=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=B1=BB=20?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=96=B0=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=87=BA=E8=B4=A7=E5=8D=951.xlsx=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dto/ExportShippingOrderDto.java    |   6 +-
 .../SysSalesShippingInformServiceImpl.java    |  52 +++++++++++++-----
 .../static/attachments/销售出货单1.xlsx  | Bin 19752 -> 19306 bytes
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingOrderDto.java b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingOrderDto.java
index 2ecd299e..59e52e87 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingOrderDto.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingOrderDto.java
@@ -13,9 +13,7 @@ public class ExportShippingOrderDto {
 
      private String materialName;
 
-     private String materialNo;
-
-     private String materialDescribe;
+     private String materialModel;
 
      private String materialUnit;
 
@@ -24,4 +22,6 @@ public class ExportShippingOrderDto {
      private String salesOrderNumber;
 
      private String remark;
+
+     private String enterpriseMaterialNo;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
index c21e726b..74b60134 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
@@ -624,6 +624,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
     public void exportShippingOrderOne(String outOrderCode, HttpServletResponse response) {
 
         String fileName = "销售出货单1.xlsx";
+        String shippingOrderCode = redisCache.generateBillNo("shd");
 
         try {
             String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName);
@@ -635,6 +636,21 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
 
             SysSalesShippingInform  salesShippingInform =  sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
 
+            String salesOrderCode = salesShippingInform.getSalesOrderCode();
+
+            List<String> salesOrderCodes = new ArrayList<>();
+
+            if (StringUtils.isNotEmpty(salesOrderCode)){
+                String[] splitSalesOrderCode = salesOrderCode.split(",");
+                salesOrderCodes = Arrays.asList(splitSalesOrderCode);
+            }
+
+
+            List<SysSalesOrder> sysSalesOrders = sysSalesOrderMapper.selectSysSalesOrderListByCodeList(salesOrderCodes);
+            HashMap<String, SysSalesOrder> salesOrderHashMap = new HashMap<>();
+            for (SysSalesOrder sysSalesOrder : sysSalesOrders) {
+                salesOrderHashMap.put(sysSalesOrder.getSalesOrderCode(),sysSalesOrder);
+            }
 
             //销售出货单
             String shippingInformationType = "2";
@@ -644,33 +660,40 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
 
 
             List<SysSalesShippingInformDetail> salesShippingInformDetails = shippingInformDetailMapper.selectSysSalesShippingInformDetailByCode(outOrderCode);
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            String deliverTime = dateFormat.format(salesShippingInform.getDeliverTime());
+
+
+
             String realFileName = salesShippingInform.getSalesOrderCode() +"-"+ fileName.substring(0, fileName.lastIndexOf("."))+ ".xlsx";
             // 设置响应头，指定文件名和文件类型
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(realFileName, "UTF-8"));
             response.setContentType("application/octet-stream");
 
 
+            List<SysSalesOrderChild> sysSalesOrderChildren = salesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes);
+
+
             AtomicInteger index = new AtomicInteger(1);
 
             //处理物料数据
             List<ExportShippingOrderDto> exportShippingOrderDtos = new ArrayList<>();
 
-            for (SysSalesShippingInformDetail salesShippingInformDetail : salesShippingInformDetails) {
+            for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) {
+                SysSalesOrder sysSalesOrder = salesOrderHashMap.get(sysSalesOrderChild.getQuoteId());
+
                 ExportShippingOrderDto exportShippingOrderDto = new ExportShippingOrderDto();
                 exportShippingOrderDto.setIndex(index.getAndIncrement());
-                exportShippingOrderDto.setMaterialName(salesShippingInformDetail.getMaterialName());
-                exportShippingOrderDto.setMaterialNo(salesShippingInformDetail.getMaterialNo());
-                exportShippingOrderDto.setMaterialDescribe(salesShippingInformDetail.getMaterialDescribe());
-                exportShippingOrderDto.setMaterialUnit(salesShippingInformDetail.getMaterialUnit());
-                exportShippingOrderDto.setMakeNum(salesShippingInformDetail.getMakeNum());
-                exportShippingOrderDto.setSalesOrderNumber(salesShippingInform.getSalesOrderNumber());
-                exportShippingOrderDto.setRemark(salesShippingInform.getRemark());
+                exportShippingOrderDto.setMaterialName(sysSalesOrderChild.getMaterialName());
+                exportShippingOrderDto.setMaterialModel(sysSalesOrderChild.getMaterialModel());
+                exportShippingOrderDto.setMaterialUnit(sysSalesOrderChild.getUnit());
+                exportShippingOrderDto.setMakeNum(sysSalesOrderChild.getMaterialNum());
+                exportShippingOrderDto.setSalesOrderNumber(sysSalesOrder.getSalesOrderNumber());
+                exportShippingOrderDto.setRemark(sysSalesOrder.getRemark());
+                exportShippingOrderDto.setEnterpriseMaterialNo(sysSalesOrder.getEnterpriseMaterialNo());
                 exportShippingOrderDtos.add(exportShippingOrderDto);
             }
 
 
+
            //totalMakeNum
             String totalMakeNum = String.valueOf(salesShippingInformDetails.stream().mapToInt(SysSalesShippingInformDetail::getMakeNum).sum());
 
@@ -681,11 +704,14 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
 
             FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
 
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String shippingDate = dateFormat.format(new Date());
+
             HashMap<String, Object> map = MapUtils.newHashMap();
             map.put("customerId",salesShippingInform.getCustomerId());
-            map.put("deliverTime",deliverTime);
-            map.put("businessMembers",salesShippingInform.getBusinessMembers());
+            map.put("shippingDate",shippingDate);
             map.put("totalMakeNum",totalMakeNum);
+            map.put("shippingOrderCode",shippingOrderCode);
 
             // 写入数据
             workBook.fill(map, sheet);
@@ -744,8 +770,6 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
                 ExportShippingOrderDto exportShippingOrderDto = new ExportShippingOrderDto();
                 exportShippingOrderDto.setIndex(index.getAndIncrement());
                 exportShippingOrderDto.setMaterialName(salesShippingInformDetail.getMaterialName());
-                exportShippingOrderDto.setMaterialNo(salesShippingInformDetail.getMaterialNo());
-                exportShippingOrderDto.setMaterialDescribe(salesShippingInformDetail.getMaterialDescribe());
                 exportShippingOrderDto.setMaterialUnit(salesShippingInformDetail.getMaterialUnit());
                 exportShippingOrderDto.setMakeNum(salesShippingInformDetail.getMakeNum());
                 exportShippingOrderDto.setSalesOrderNumber(salesShippingInform.getSalesOrderNumber());
diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货单1.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货单1.xlsx
index 3fbb9f2f754f140c3dc30fbf8dc51f6f1cfd1633..f7f8a848852093e29fa67f8bbda9693f97000c00 100644
GIT binary patch
delta 7849
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
T+68Y=qk!Y9lRqg1{e}Dw4+XV%

delta 8299
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


From ade3aee840ec278ecf623d221b46682aaf0e520a Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 3 Dec 2024 09:30:19 +0800
Subject: [PATCH 05/10] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4:=20=E9=87=8D=E5=86=99=E5=AF=BC=E5=87=BA=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=952=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E6=8C=89=E7=85=A7=E6=96=B0?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9=E5=87=BA=E8=B4=A7=E5=8D=95?=
 =?UTF-8?q?2.xlsx=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SysSalesShippingInformServiceImpl.java    |  55 +++++++++++++-----
 .../static/attachments/销售出货单1.xlsx  | Bin 19306 -> 19342 bytes
 .../static/attachments/销售出货单2.xlsx  | Bin 89100 -> 88463 bytes
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
index 74b60134..1b86e8ad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
@@ -695,7 +695,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
 
 
            //totalMakeNum
-            String totalMakeNum = String.valueOf(salesShippingInformDetails.stream().mapToInt(SysSalesShippingInformDetail::getMakeNum).sum());
+            String totalMakeNum = String.valueOf(sysSalesOrderChildren.stream().mapToInt(SysSalesOrderChild::getMaterialNum).sum());
 
 
             ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build();
@@ -732,7 +732,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
     public void exportShippingOrderTwo(String outOrderCode, HttpServletResponse response) {
 
         String fileName = "销售出货单2.xlsx";
-
+        String shippingOrderCode = redisCache.generateBillNo("shd");
 
         try {
             String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName);
@@ -746,6 +746,22 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
             SysSalesShippingInform  salesShippingInform =  sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
 
 
+            String salesOrderCode = salesShippingInform.getSalesOrderCode();
+
+            List<String> salesOrderCodes = new ArrayList<>();
+
+            if (StringUtils.isNotEmpty(salesOrderCode)){
+                String[] splitSalesOrderCode = salesOrderCode.split(",");
+                salesOrderCodes = Arrays.asList(splitSalesOrderCode);
+            }
+
+
+            List<SysSalesOrder> sysSalesOrders = sysSalesOrderMapper.selectSysSalesOrderListByCodeList(salesOrderCodes);
+            HashMap<String, SysSalesOrder> salesOrderHashMap = new HashMap<>();
+            for (SysSalesOrder sysSalesOrder : sysSalesOrders) {
+                salesOrderHashMap.put(sysSalesOrder.getSalesOrderCode(),sysSalesOrder);
+            }
+
             //销售出货单
             String shippingInformationType = "2";
             String shippingTemplateType = "销售出货单2";
@@ -753,33 +769,42 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
             insertShippingInformation(outOrderCode,shippingInformationType,shippingTemplateType,salesShippingInform);
 
             List<SysSalesShippingInformDetail> salesShippingInformDetails = shippingInformDetailMapper.selectSysSalesShippingInformDetailByCode(outOrderCode);
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            String deliverTime = dateFormat.format(salesShippingInform.getDeliverTime());
+
+
             String realFileName = salesShippingInform.getSalesOrderCode() +"-"+ fileName.substring(0, fileName.lastIndexOf("."))+ ".xlsx";
             // 设置响应头，指定文件名和文件类型
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(realFileName, "UTF-8"));
             response.setContentType("application/octet-stream");
 
 
+
+            List<SysSalesOrderChild> sysSalesOrderChildren = salesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes);
+
+
             AtomicInteger index = new AtomicInteger(1);
 
             //处理物料数据
             List<ExportShippingOrderDto> exportShippingOrderDtos = new ArrayList<>();
 
-            for (SysSalesShippingInformDetail salesShippingInformDetail : salesShippingInformDetails) {
+            for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) {
+                SysSalesOrder sysSalesOrder = salesOrderHashMap.get(sysSalesOrderChild.getQuoteId());
+
                 ExportShippingOrderDto exportShippingOrderDto = new ExportShippingOrderDto();
                 exportShippingOrderDto.setIndex(index.getAndIncrement());
-                exportShippingOrderDto.setMaterialName(salesShippingInformDetail.getMaterialName());
-                exportShippingOrderDto.setMaterialUnit(salesShippingInformDetail.getMaterialUnit());
-                exportShippingOrderDto.setMakeNum(salesShippingInformDetail.getMakeNum());
-                exportShippingOrderDto.setSalesOrderNumber(salesShippingInform.getSalesOrderNumber());
-                exportShippingOrderDto.setRemark(salesShippingInform.getRemark());
+                exportShippingOrderDto.setMaterialName(sysSalesOrderChild.getMaterialName());
+                exportShippingOrderDto.setMaterialModel(sysSalesOrderChild.getMaterialModel());
+                exportShippingOrderDto.setMaterialUnit(sysSalesOrderChild.getUnit());
+                exportShippingOrderDto.setMakeNum(sysSalesOrderChild.getMaterialNum());
+                exportShippingOrderDto.setSalesOrderNumber(sysSalesOrder.getSalesOrderNumber());
+                exportShippingOrderDto.setRemark(sysSalesOrder.getRemark());
+                exportShippingOrderDto.setEnterpriseMaterialNo(sysSalesOrder.getEnterpriseMaterialNo());
                 exportShippingOrderDtos.add(exportShippingOrderDto);
             }
 
 
+
             //totalMakeNum
-            String totalMakeNum = String.valueOf(salesShippingInformDetails.stream().mapToInt(SysSalesShippingInformDetail::getMakeNum).sum());
+            String totalMakeNum = String.valueOf(sysSalesOrderChildren.stream().mapToInt(SysSalesOrderChild::getMaterialNum).sum());
 
 
             ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build();
@@ -789,10 +814,14 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
             FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
 
             HashMap<String, Object> map = MapUtils.newHashMap();
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String shippingDate = dateFormat.format(new Date());
+
+
             map.put("customerId",salesShippingInform.getCustomerId());
-            map.put("deliverTime",deliverTime);
-            map.put("businessMembers",salesShippingInform.getBusinessMembers());
+            map.put("shippingDate",shippingDate);
             map.put("totalMakeNum",totalMakeNum);
+            map.put("shippingOrderCode",shippingOrderCode);
 
             // 写入数据
             workBook.fill(map, sheet);
diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货单1.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货单1.xlsx
index f7f8a848852093e29fa67f8bbda9693f97000c00..263bf01c78a7685c8cf42c4092eabe51f21e29c2 100644
GIT binary patch
delta 5921
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

delta 5899
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
Ikbju}2L+cLq5uE@

diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货单2.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货单2.xlsx
index 5fbf35b59ce41651c08e5face5b0c55f19508fa2..4b9c888c24ec98010489b599b9afad80558b50fb 100644
GIT binary patch
delta 7752
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
KR`>Z?1O5+Ut#`Em

delta 8326
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


From 034ada3f32742fff1a024c58c5039c1ef0378e5f Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 3 Dec 2024 10:10:07 +0800
Subject: [PATCH 06/10] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4:=20=E9=87=8D=E5=86=99=E5=AF=BC=E5=87=BA=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E7=AE=B1=E5=8D=951=E6=A8=A1=E6=9D=BF=E7=9A=84?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E7=AE=B1?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E7=B1=BB=20=E6=8C=89=E7=85=A7=E6=96=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E8=B4=A7=E7=AE=B1=E5=8D=951.xlsx?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=20=E9=87=8D=E5=86=99=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=87=BA=E8=B4=A7=E7=AE=B1=E5=8D=952=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=9A=84=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E6=96=B0=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E7=AE=B1=E5=8D=952.xlsx=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dto/ExportShippingPackingDto.java  |  10 ++
 .../SysSalesShippingInformServiceImpl.java    | 119 +++++++++++++-----
 .../attachments/销售出货箱单1.xlsx      | Bin 91701 -> 91766 bytes
 .../attachments/销售出货箱单2.xlsx      | Bin 31297 -> 31339 bytes
 4 files changed, 98 insertions(+), 31 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingPackingDto.java b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingPackingDto.java
index dda12cc2..4cbf0b2f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingPackingDto.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingPackingDto.java
@@ -18,5 +18,15 @@ public class ExportShippingPackingDto {
 
     private Integer materialNum;
 
+    private String box;
 
+    private String oneBox;
+
+    private String twoBox;
+
+    private String totalNW;
+
+    private String totalGW;
+
+    private String meas;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
index 1b86e8ad..902d0aab 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
@@ -853,9 +853,11 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
             SysSalesShippingInform sysSalesShippingInform = sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
             String shippingInformationType = "0";
             String shippingTemplateType = "销售出货箱单1";
+
+            String salesOrderCode = sysSalesShippingInform.getSalesOrderCode();
+
             //生成出货资料
             insertShippingInformation(outOrderCode,shippingInformationType,shippingTemplateType,sysSalesShippingInform);
-            String salesOrderCode = sysSalesShippingInform.getSalesOrderCode();
 
            String realFileName = salesOrderCode + "-" + fileName.substring(0, fileName.lastIndexOf(".")) + ".xlsx";
 
@@ -863,35 +865,65 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(realFileName, "UTF-8"));
             response.setContentType("application/octet-stream");
 
-            SysMakeOrder sysMakeOrder = sysMakeOrderMapper.selectMakeOrderBySaleNo(salesOrderCode);
 
-            if (sysMakeOrder == null){
-                log.warn("未找到对应的生产订单,请检查:{}", salesOrderCode);
-                throw new RuntimeException("未找到对应的生产订单,请检查");
+
+
+            List<String> salesOrderCodes = new ArrayList<>();
+
+            if (StringUtils.isNotEmpty(salesOrderCode)){
+                String[] splitSalesOrderCode = salesOrderCode.split(",");
+                salesOrderCodes = Arrays.asList(splitSalesOrderCode);
             }
 
-            Map<String, Object> map = new HashMap<>();
 
-            map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto());
-            map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto());
-            map.put("customerContact",sysSalesShippingInform.getCustomerContact());
-            map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress());
+            //生产订主表的数据
+            List<SysMakeOrder> sysMakeOrders = sysMakeOrderMapper.selectMakeOrderListBySalesOrderCodes(salesOrderCodes);
+
+            //获取销售订单的明细
+            List<SysSalesOrderChild> sysSalesOrderChildren = salesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes);
+
+
+
+            Map<String, SysMakeOrder> makeOrderMap = new HashMap<>();
+
+            for (SysMakeOrder sysMakeOrder : sysMakeOrders) {
+                makeOrderMap.put(sysMakeOrder.getSaleNo(),sysMakeOrder);
+            }
+
 
             List<ExportShippingPackingDto> shippingPackingDtos = new ArrayList<>();
 
             AtomicInteger index = new AtomicInteger(1);
 
-            List<AfterSalesShippingDevice> shippingDeviceList = salesShippingDeviceMapper.selectShippingDeviceBySalesOrderCode(salesOrderCode);
-            for (AfterSalesShippingDevice shippingDevice : shippingDeviceList) {
+
+            for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) {
+                SysMakeOrder sysMakeOrder = makeOrderMap.get(sysSalesOrderChild.getQuoteId());
                 ExportShippingPackingDto exportShippingPackingDto = new ExportShippingPackingDto();
                 exportShippingPackingDto.setIndex(index.getAndIncrement());
-                exportShippingPackingDto.setMaterialDescribe(shippingDevice.getMaterialDescribe());
-                exportShippingPackingDto.setMaterialModel(shippingDevice.getMaterialModelCode());
-                exportShippingPackingDto.setMakeNo(shippingDevice.getMakeNo());
-                exportShippingPackingDto.setMaterialNum(1);
+                exportShippingPackingDto.setMaterialDescribe(sysSalesOrderChild.getDescribe());
+                exportShippingPackingDto.setMaterialModel(sysSalesOrderChild.getMaterialModel());
+                exportShippingPackingDto.setMakeNo(sysMakeOrder.getMakeNo());
+                exportShippingPackingDto.setMaterialNum(sysSalesOrderChild.getMaterialNum());
+                exportShippingPackingDto.setBox(null);
+                exportShippingPackingDto.setOneBox(null);
+                exportShippingPackingDto.setMeas(null);
+                exportShippingPackingDto.setTwoBox(null);
+                exportShippingPackingDto.setTotalGW(null);
+                exportShippingPackingDto.setTotalNW(null);
                 shippingPackingDtos.add(exportShippingPackingDto);
+
             }
 
+
+
+            Map<String, Object> map = new HashMap<>();
+
+            map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto());
+            map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto());
+            map.put("customerContact",sysSalesShippingInform.getCustomerContact());
+            map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress());
+
+
             //构建模板
             ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build();
             WriteSheet sheet = EasyExcel.writerSheet().build();
@@ -944,35 +976,60 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(realFileName, "UTF-8"));
             response.setContentType("application/octet-stream");
 
-            SysMakeOrder sysMakeOrder = sysMakeOrderMapper.selectMakeOrderBySaleNo(salesOrderCode);
 
-            if (sysMakeOrder == null){
-                log.warn("未找到对应的生产订单,请检查:{}", salesOrderCode);
-                throw new RuntimeException("未找到对应的生产订单,请检查");
+            List<String> salesOrderCodes = new ArrayList<>();
+
+            if (StringUtils.isNotEmpty(salesOrderCode)){
+                String[] splitSalesOrderCode = salesOrderCode.split(",");
+                salesOrderCodes = Arrays.asList(splitSalesOrderCode);
             }
 
-            Map<String, Object> map = new HashMap<>();
 
-            map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto());
-            map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto());
-            map.put("customerContact",sysSalesShippingInform.getCustomerContact());
-            map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress());
+            //生产订主表的数据
+            List<SysMakeOrder> sysMakeOrders = sysMakeOrderMapper.selectMakeOrderListBySalesOrderCodes(salesOrderCodes);
+
+            //获取销售订单的明细
+            List<SysSalesOrderChild> sysSalesOrderChildren = salesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes);
+
+
+
+            Map<String, SysMakeOrder> makeOrderMap = new HashMap<>();
+
+            for (SysMakeOrder sysMakeOrder : sysMakeOrders) {
+                makeOrderMap.put(sysMakeOrder.getSaleNo(),sysMakeOrder);
+            }
+
 
             List<ExportShippingPackingDto> shippingPackingDtos = new ArrayList<>();
 
             AtomicInteger index = new AtomicInteger(1);
 
-            List<AfterSalesShippingDevice> shippingDeviceList = salesShippingDeviceMapper.selectShippingDeviceBySalesOrderCode(salesOrderCode);
-            for (AfterSalesShippingDevice shippingDevice : shippingDeviceList) {
+
+            for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) {
+                SysMakeOrder sysMakeOrder = makeOrderMap.get(sysSalesOrderChild.getQuoteId());
                 ExportShippingPackingDto exportShippingPackingDto = new ExportShippingPackingDto();
                 exportShippingPackingDto.setIndex(index.getAndIncrement());
-                exportShippingPackingDto.setMaterialDescribe(shippingDevice.getMaterialDescribe());
-                exportShippingPackingDto.setMaterialModel(shippingDevice.getMaterialModelCode());
-                exportShippingPackingDto.setMakeNo(shippingDevice.getMakeNo());
-                exportShippingPackingDto.setMaterialNum(1);
+                exportShippingPackingDto.setMaterialDescribe(sysSalesOrderChild.getDescribe());
+                exportShippingPackingDto.setMaterialModel(sysSalesOrderChild.getMaterialModel());
+                exportShippingPackingDto.setMakeNo(sysMakeOrder.getMakeNo());
+                exportShippingPackingDto.setMaterialNum(sysSalesOrderChild.getMaterialNum());
+                exportShippingPackingDto.setBox(null);
+                exportShippingPackingDto.setOneBox(null);
+                exportShippingPackingDto.setMeas(null);
+                exportShippingPackingDto.setTwoBox(null);
+                exportShippingPackingDto.setTotalGW(null);
+                exportShippingPackingDto.setTotalNW(null);
                 shippingPackingDtos.add(exportShippingPackingDto);
+
             }
 
+            Map<String, Object> map = new HashMap<>();
+
+            map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto());
+            map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto());
+            map.put("customerContact",sysSalesShippingInform.getCustomerContact());
+            map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress());
+
             //构建模板
             ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build();
             WriteSheet sheet = EasyExcel.writerSheet().build();
diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货箱单1.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货箱单1.xlsx
index eef3e6f7cb303ab2e559aac2ce23bf020357a3d8..b93f752ee6fd22c553ebdaf2485795cc75b78d0b 100644
GIT binary patch
delta 4879
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
WksNpZ&d&!UbO8h}DcA!z)Bgd5WhY4h

delta 4806
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
GsQv@yo&g2`

diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货箱单2.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货箱单2.xlsx
index 115fd87508e1f2485d9d62ef279913348620baa6..e823b97b51aaec5bc61b011876533376132f6b94 100644
GIT binary patch
delta 8316
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
TYk|DTUSNVCF7z_*-**28W6st}

delta 8285
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
TuR#o}5`onNh>(LkAMO4JxTL$D


From cbc673daf3f30c6281bee5b59011a2b9eec6765b Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 3 Dec 2024 14:05:48 +0800
Subject: [PATCH 07/10] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4:=20=E9=87=8D=E5=86=99=E5=AF=BC=E5=87=BA=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E5=8F=91=E7=A5=A81=E6=A8=A1=E6=9D=BF=E7=9A=84?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E6=A8=A1=E6=9D=BF=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E7=B1=BB=20=E6=8C=89=E7=85=A7=E6=96=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E8=B4=A7=E5=8F=91=E7=A5=A81.xlsx?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=20=E9=87=8D=E5=86=99=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=87=BA=E8=B4=A7=E5=8F=91=E7=A5=A82=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=9A=84=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E6=96=B0=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E5=8F=91=E7=A5=A82.xlsx=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dto/ExportShippingInvoiceDto.java  |   7 +-
 .../SysSalesShippingInformServiceImpl.java    | 153 ++++++++++++------
 .../attachments/销售出货发票1.xlsx      | Bin 89413 -> 89424 bytes
 .../attachments/销售出货发票2.xlsx      | Bin 29190 -> 29138 bytes
 .../salesShippingInform.html                  |   4 +-
 5 files changed, 114 insertions(+), 50 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInvoiceDto.java b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInvoiceDto.java
index eed8c878..b075df5e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInvoiceDto.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInvoiceDto.java
@@ -15,12 +15,15 @@ public class ExportShippingInvoiceDto {
 
     private String materialName;
 
+    private String materialModel;
+
     private String makeNo;
 
     private Integer materialNum;
 
-    private BigDecimal materialUsd;
+    private String materialAmount;
 
-    private BigDecimal materialUsdSum;
+    private String materialAmountSum;
 
+    private String total;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
index 902d0aab..b45f411b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
@@ -1075,51 +1075,83 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
             insertShippingInformation(outOrderCode,shippingInformationType,shippingTemplateType,sysSalesShippingInform);
 
             String salesOrderCode = sysSalesShippingInform.getSalesOrderCode();
-            SysMakeOrder sysMakeOrder = sysMakeOrderMapper.selectMakeOrderBySaleNo(salesOrderCode);
 
-            List<SysSalesOrderChild> sysSalesOrderChildren = salesOrderChildMapper.selectOrderChildListBySalesOrderCode(salesOrderCode);
+            List<String> salesOrderCodes = new ArrayList<>();
 
-            String makeNo = sysMakeOrder.getMakeNo();
-            if (!StringUtils.isEmpty(makeNo)){
-                List<AfterSalesShippingDevice> afterSalesShippingDevices = salesShippingDeviceMapper.selectShippingDeviceByMakeNo(makeNo);
+            if (StringUtils.isNotEmpty(salesOrderCode)){
+                String[] splitSalesOrderCode = salesOrderCode.split(",");
+                salesOrderCodes = Arrays.asList(splitSalesOrderCode);
             }
 
-            Map<String, Object> map = new HashMap<>();
-            map.put("customerContact",sysSalesShippingInform.getCustomerContact());
-            map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress());
-            map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto());
-            map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto());
+            //生产订主表的数据
+            List<SysMakeOrder> sysMakeOrders = sysMakeOrderMapper.selectMakeOrderListBySalesOrderCodes(salesOrderCodes);
+
+
+            //销售订单主表的数据
+            List<SysSalesOrder> sysSalesOrders = sysSalesOrderMapper.selectSysSalesOrderListByCodeList(salesOrderCodes);
+
+            //获取销售订单的明细
+            List<SysSalesOrderChild> sysSalesOrderChildren = salesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes);
+
+
+
+            Map<String, SysMakeOrder> makeOrderMap = new HashMap<>();
+
+            for (SysMakeOrder sysMakeOrder : sysMakeOrders) {
+                makeOrderMap.put(sysMakeOrder.getSaleNo(),sysMakeOrder);
+            }
+
+            Map<String, SysSalesOrder> salesOrderMap = new HashMap<>();
+
+            for (SysSalesOrder sysSalesOrder : sysSalesOrders) {
+                salesOrderMap.put(sysSalesOrder.getSalesOrderCode(),sysSalesOrder);
+            }
 
 
             ArrayList<ExportShippingInvoiceDto> exportShippingInvoiceDtos = new ArrayList<>();
 
+
             AtomicInteger index = new AtomicInteger(1);
 
             for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) {
                 ExportShippingInvoiceDto exportShippingInvoiceDto = new ExportShippingInvoiceDto();
+                SysMakeOrder sysMakeOrder = makeOrderMap.get(sysSalesOrderChild.getQuoteId());
+                SysSalesOrder sysSalesOrder = salesOrderMap.get(sysSalesOrderChild.getQuoteId());
+
                 exportShippingInvoiceDto.setIndex(index.getAndIncrement());
+                exportShippingInvoiceDto.setMaterialModel(sysSalesOrderChild.getMaterialModel());
                 exportShippingInvoiceDto.setMaterialName(sysSalesOrderChild.getMaterialName());
-                exportShippingInvoiceDto.setMaterialNum(1);
+                exportShippingInvoiceDto.setMaterialNum(sysSalesOrderChild.getMaterialNum());
+                exportShippingInvoiceDto.setMakeNo(sysMakeOrder.getMakeNo());
 
-                if (sysSalesOrderChild.getMaterialUsd() != null) {
-                    exportShippingInvoiceDto.setMaterialUsd(new BigDecimal(sysSalesOrderChild.getMaterialUsd()));
-                } else {
-                    // 如果 materialUsd 为 null，可以设置为默认值或者保持不变
-                    exportShippingInvoiceDto.setMaterialUsd(BigDecimal.ZERO);  // 示例: 设置为0
-                }
+                if ("1".equals(sysSalesOrder.getCommonCurrency())){
+
+                    String materialNoRmb = sysSalesOrderChild.getMaterialNoRmb().toString();
+                    String materialNoRmbSum = sysSalesOrderChild.getMaterialNoRmbSum().toString();
+                    exportShippingInvoiceDto.setMaterialAmount(materialNoRmb + "RMB");
+                    exportShippingInvoiceDto.setMaterialAmountSum(materialNoRmbSum + "RMB");
 
-                if (sysSalesOrderChild.getMaterialUsdSum() != null) {
-                    exportShippingInvoiceDto.setMaterialUsdSum(new BigDecimal(sysSalesOrderChild.getMaterialUsdSum()));
                 } else {
-                    // 如果 materialUsdSum 为 null，可以设置为默认值或者保持不变
-                    exportShippingInvoiceDto.setMaterialUsdSum(BigDecimal.ZERO);  // 示例: 设置为0
+
+                    String materialNoUsd = sysSalesOrderChild.getMaterialNoUsd().toString();
+                    String materialNoUsdSum = sysSalesOrderChild.getMaterialNoUsdSum().toString();
+                    exportShippingInvoiceDto.setMaterialAmount(materialNoUsd + "USD");
+                    exportShippingInvoiceDto.setMaterialAmountSum(materialNoUsdSum + "USD");
                 }
-                exportShippingInvoiceDto.setMakeNo(makeNo);
-                // to do 缺少物料型号
+
                 exportShippingInvoiceDtos.add(exportShippingInvoiceDto);
             }
 
 
+
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("customerContact",sysSalesShippingInform.getCustomerContact());
+            map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress());
+            map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto());
+            map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto());
+
+
             ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build();
             WriteSheet sheet = EasyExcel.writerSheet().build();
             FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
@@ -1163,50 +1195,79 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
             insertShippingInformation(outOrderCode,shippingInformationType,shippingTemplateType,sysSalesShippingInform);
 
             String salesOrderCode = sysSalesShippingInform.getSalesOrderCode();
-            SysMakeOrder sysMakeOrder = sysMakeOrderMapper.selectMakeOrderBySaleNo(salesOrderCode);
 
-            List<SysSalesOrderChild> sysSalesOrderChildren = salesOrderChildMapper.selectOrderChildListBySalesOrderCode(salesOrderCode);
+            List<String> salesOrderCodes = new ArrayList<>();
 
-            String makeNo = sysMakeOrder.getMakeNo();
-            if (!StringUtils.isEmpty(makeNo)){
-                List<AfterSalesShippingDevice> afterSalesShippingDevices = salesShippingDeviceMapper.selectShippingDeviceByMakeNo(makeNo);
+            if (StringUtils.isNotEmpty(salesOrderCode)){
+                String[] splitSalesOrderCode = salesOrderCode.split(",");
+                salesOrderCodes = Arrays.asList(splitSalesOrderCode);
             }
 
-            Map<String, Object> map = new HashMap<>();
-            map.put("customerContact",sysSalesShippingInform.getCustomerContact());
-            map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress());
-            map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto());
-            map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto());
+            //生产订主表的数据
+            List<SysMakeOrder> sysMakeOrders = sysMakeOrderMapper.selectMakeOrderListBySalesOrderCodes(salesOrderCodes);
+
+
+            //销售订单主表的数据
+            List<SysSalesOrder> sysSalesOrders = sysSalesOrderMapper.selectSysSalesOrderListByCodeList(salesOrderCodes);
+
+            //获取销售订单的明细
+            List<SysSalesOrderChild> sysSalesOrderChildren = salesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes);
+
+
+
+            Map<String, SysMakeOrder> makeOrderMap = new HashMap<>();
+
+            for (SysMakeOrder sysMakeOrder : sysMakeOrders) {
+                makeOrderMap.put(sysMakeOrder.getSaleNo(),sysMakeOrder);
+            }
+
+            Map<String, SysSalesOrder> salesOrderMap = new HashMap<>();
+
+            for (SysSalesOrder sysSalesOrder : sysSalesOrders) {
+                salesOrderMap.put(sysSalesOrder.getSalesOrderCode(),sysSalesOrder);
+            }
 
 
             ArrayList<ExportShippingInvoiceDto> exportShippingInvoiceDtos = new ArrayList<>();
 
+
             AtomicInteger index = new AtomicInteger(1);
 
             for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) {
                 ExportShippingInvoiceDto exportShippingInvoiceDto = new ExportShippingInvoiceDto();
+                SysMakeOrder sysMakeOrder = makeOrderMap.get(sysSalesOrderChild.getQuoteId());
+                SysSalesOrder sysSalesOrder = salesOrderMap.get(sysSalesOrderChild.getQuoteId());
+
                 exportShippingInvoiceDto.setIndex(index.getAndIncrement());
+                exportShippingInvoiceDto.setMaterialModel(sysSalesOrderChild.getMaterialModel());
                 exportShippingInvoiceDto.setMaterialName(sysSalesOrderChild.getMaterialName());
-                exportShippingInvoiceDto.setMaterialNum(1);
+                exportShippingInvoiceDto.setMaterialNum(sysSalesOrderChild.getMaterialNum());
+                exportShippingInvoiceDto.setMakeNo(sysMakeOrder.getMakeNo());
 
-                if (sysSalesOrderChild.getMaterialUsd() != null) {
-                    exportShippingInvoiceDto.setMaterialUsd(new BigDecimal(sysSalesOrderChild.getMaterialUsd()));
-                } else {
-                    // 如果 materialUsd 为 null，可以设置为默认值或者保持不变
-                    exportShippingInvoiceDto.setMaterialUsd(BigDecimal.ZERO);  // 示例: 设置为0
-                }
+                if ("1".equals(sysSalesOrder.getCommonCurrency())){
+
+                    String materialNoRmb = sysSalesOrderChild.getMaterialNoRmb().toString();
+                    String materialNoRmbSum = sysSalesOrderChild.getMaterialNoRmbSum().toString();
+                    exportShippingInvoiceDto.setMaterialAmount(materialNoRmb + "RMB");
+                    exportShippingInvoiceDto.setMaterialAmountSum(materialNoRmbSum + "RMB");
 
-                if (sysSalesOrderChild.getMaterialUsdSum() != null) {
-                    exportShippingInvoiceDto.setMaterialUsdSum(new BigDecimal(sysSalesOrderChild.getMaterialUsdSum()));
                 } else {
-                    // 如果 materialUsdSum 为 null，可以设置为默认值或者保持不变
-                    exportShippingInvoiceDto.setMaterialUsdSum(BigDecimal.ZERO);  // 示例: 设置为0
+
+                    String materialNoUsd = sysSalesOrderChild.getMaterialNoUsd().toString();
+                    String materialNoUsdSum = sysSalesOrderChild.getMaterialNoUsdSum().toString();
+                    exportShippingInvoiceDto.setMaterialAmount(materialNoUsd + "USD");
+                    exportShippingInvoiceDto.setMaterialAmountSum(materialNoUsdSum + "USD");
                 }
-                exportShippingInvoiceDto.setMakeNo(makeNo);
-                // to do 缺少物料型号
+
                 exportShippingInvoiceDtos.add(exportShippingInvoiceDto);
             }
 
+            Map<String, Object> map = new HashMap<>();
+            map.put("customerContact",sysSalesShippingInform.getCustomerContact());
+            map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress());
+            map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto());
+            map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto());
+
 
             ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build();
             WriteSheet sheet = EasyExcel.writerSheet().build();
diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货发票1.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货发票1.xlsx
index 5153f88d1b5f38afb1341bf4c256198a4f0c25c9..d712f516b79ff9b2332461f02635b0f209d2c82c 100644
GIT binary patch
delta 4514
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

delta 4495
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

diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货发票2.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货发票2.xlsx
index 7cda613a96bb1ddfc602b011cfd9ca20d769c644..4f0494a831a82cad9298b0bd434b39f3049ff662 100644
GIT binary patch
delta 6032
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

delta 6062
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

diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
index 6e6bf075..5c25a2fc 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
@@ -524,7 +524,7 @@
             const row = selectedRows[0];
 
             // 使用 $.modal.confirm 显示确认对话框
-            $.modal.confirm("确定导出这条数据的出货单吗？", function() {
+            $.modal.confirm("确定导出这条数据的出货发票1吗？", function() {
                 // 如果用户点击确定，继续导出
                 var outOrderCode = row.outOrderCode;
                 window.location.href = prefix + "/exportShippingInvoiceOne/" + outOrderCode;
@@ -546,7 +546,7 @@
             const row = selectedRows[0];
 
             // 使用 $.modal.confirm 显示确认对话框
-            $.modal.confirm("确定导出这条数据的出货单吗？", function() {
+            $.modal.confirm("确定导出这条数据的出货发票吗？", function() {
                 // 如果用户点击确定，继续导出
                 var outOrderCode = row.outOrderCode;
                 window.location.href = prefix + "/exportShippingInvoiceTwo/" + outOrderCode;

From 603200175559358ab51c099523d9775244881ff1 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 3 Dec 2024 14:19:27 +0800
Subject: [PATCH 08/10] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9A=E5=8E=BB=E6=8E=89=E5=AF=BC=E5=87=BA=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E6=A8=A1=E6=9D=BF=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/salesOrder/salesOrder.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
index 0e49617a..2216202b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
@@ -111,11 +111,11 @@
                 <i class="fa fa-plus"></i> 添加
             </a>
             <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:salesOrder:export">
-                <i class="fa fa-download"></i> 导出销售订单列表
-            </a>
-            <a class="btn btn-success" onclick="exportSalesOrder()" shiro:hasPermission="system:salesOrder:exportSalesOrder">
-                <i class="fa fa-download"></i> 导出销售订单模板
+                <i class="fa fa-download"></i> 导出
             </a>
+<!--            <a class="btn btn-success" onclick="exportSalesOrder()" shiro:hasPermission="system:salesOrder:exportSalesOrder">-->
+<!--                <i class="fa fa-download"></i> 导出销售订单模板-->
+<!--            </a>-->
             <a class="btn btn-success" onclick="salesDeliverGoods()" shiro:hasPermission="system:salesOrder:salesDeliverGoods">
                 <i class="fa fa-plus"></i> 出货
             </a>

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 09/10] =?UTF-8?q?[feat]=20=E5=BA=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4:=E6=A0=B9=E6=8D=AE=E6=96=B0=E7=89=88prd=20=E9=87=8D?=
 =?UTF-8?q?=E5=86=99=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E5=AE=9E=E4=BD=93=E7=B1=BB?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2mapper?=
 =?UTF-8?q?.xml=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 @@
 <?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,131 +23,68 @@ 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">
         <include refid="selectWarehouseInventoryInquiryDetailVo"/>
-        <where>  
+        <where>
         </where>
     </select>
-    
+
     <select id="selectWarehouseInventoryInquiryDetailById" parameterType="Long" resultMap="WarehouseInventoryInquiryDetailResult">
         <include refid="selectWarehouseInventoryInquiryDetailVo"/>
         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>
@@ -181,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <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=")">
             #{inventoryInquiryDetailId}
         </foreach>

From 76351c8f6ecca0e4bf6c37e8febf2d71cd677e82 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 3 Dec 2024 19:15:25 +0800
Subject: [PATCH 10/10] =?UTF-8?q?[feat]=20=E5=BA=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E4=B8=BB?=
 =?UTF-8?q?=E8=A1=A8,=E5=AE=9E=E4=BD=93=E7=B1=BB,Mapper.xml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=96=B0=E5=A2=9E:=E5=85=B1=E4=BA=AB=E5=8F=AF?=
 =?UTF-8?q?=E7=94=A8=E5=BA=93=E5=AD=98=E6=95=B0=E3=80=81=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98=E6=95=B0=E3=80=81=E9=94=81?=
 =?UTF-8?q?=E5=AE=9A=E5=BA=93=E5=AD=98=E6=95=B0=E3=80=81=E7=9B=98=E4=BA=8F?=
 =?UTF-8?q?=E6=95=B0=20=E6=89=80=E6=9C=89=E4=B8=8E=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E6=9C=89=E5=85=B3=E7=9A=84=E6=95=B0=E6=8D=AE=E9=83=BD=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAInteger=E7=B1=BB=E5=9E=8B=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7Bom=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=20=E5=A7=94=E5=A4=96=E5=B7=A5=E5=BA=8F=E6=95=B0?=
 =?UTF-8?q?=E7=AD=89=E6=95=B0=E9=87=8F=E7=9B=B8=E5=85=B3=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=83=BD=E6=94=B9=E4=B8=BAInteger=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7Bom=E7=9A=84=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E7=B1=BB=E4=B8=AD=E7=9A=84=E4=B8=9A=E5=8A=A1=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95,=E6=8A=8A=E6=89=80=E6=9C=89=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=95=B0=E6=8D=AE=E7=94=B1BigDecima?=
 =?UTF-8?q?l=E6=94=B9=E4=B8=BAInteger=E7=B1=BB=E5=9E=8B=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E4=BB=93=E5=BA=93=E5=BA=93=E5=AD=98=E6=8A=A5?=
 =?UTF-8?q?=E6=8D=9F=E5=AF=B9=E8=B1=A1=20=E6=89=80=E6=9C=89=E4=B8=8E?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=9C=89=E5=85=B3=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=83=BD=E6=94=B9=E4=B8=BAInteger=E7=B1=BB=E5=9E=8B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BB=93=E5=BA=93=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=8A=A5=E6=8D=9F=E5=AD=90=E8=A1=A8=E5=AF=B9=E8=B1=A1=20?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E4=B8=8E=E6=95=B0=E9=87=8F=E6=9C=89=E5=85=B3?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E9=83=BD=E6=94=B9=E4=B8=BAInteger?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=8A=A5=E6=8D=9F=E7=9A=84=E5=AE=9E=E7=8E=B0=E7=B1=BB=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E4=B8=9A=E5=8A=A1=E6=96=B9=E6=B3=95,=E6=8A=8A?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E9=87=8F=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=94=B1BigDecimal=E6=94=B9=E4=B8=BAInteger?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E4=BF=AE=E6=94=B9=20=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=E5=AE=9E=E7=8E=B0=E5=B1=82=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?,=E6=8A=8A=E5=85=A5=E5=BA=93=E6=95=B0=E7=AD=89=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=E7=9B=B8=E5=85=B3=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=94=B1BigDecimal=E6=94=B9=E4=B8=BAInteger=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/domain/SysMakeorderBom.java  |  70 ++++++-----
 .../impl/SysMakeorderBomServiceImpl.java      |   2 +-
 .../domain/WarehouseInventoryInquiry.java     | 118 ++++++++++++------
 .../WarehouseInventoryReportDamage.java       |  28 ++---
 .../WarehouseInventoryReportDamageChild.java  |  16 +--
 ...houseInventoryReportDamageServiceImpl.java |  22 ++--
 .../impl/WarehouseOutOrderServiceImpl.java    |  10 +-
 .../WarehouseStorageOrderServiceImpl.java     |  18 +--
 .../WarehouseInventoryInquiryMapper.xml       |  18 ++-
 9 files changed, 182 insertions(+), 120 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderBom.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderBom.java
index de8e5941..df1e61b3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderBom.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderBom.java
@@ -94,24 +94,24 @@ public class SysMakeorderBom extends BaseEntity
     private Long sortNo;
 
 //    委外工序数
-    private int processNum;
+    private Integer processNum;
 
 //    已委外数量
-    private int hasOutNum;
+    private Integer hasOutNum;
 
 //    可用库存数
-    private BigDecimal storageNum;
+    private Integer storageNum;
 
 //    已领料数
-    private int hasPickNum;
+    private Integer hasPickNum;
 
 //    订单数量
-    private int orderNum;
+    private Integer orderNum;
 
 //    客户期望交付时间
     private Date deliveryTime;
 
-    private int finishNum;
+    private Integer finishNum;
 
 //    已完成数
     public void setId(Long id) 
@@ -285,67 +285,69 @@ public class SysMakeorderBom extends BaseEntity
         this.warehouseDept = warehouseDept;
     }
 
-    public int getProcessNum() {
+
+    public String getMaterialModel() {
+        return materialModel;
+    }
+
+    public void setMaterialModel(String materialModel) {
+        this.materialModel = materialModel;
+    }
+
+    public Date getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(Date deliveryTime) {
+        this.deliveryTime = deliveryTime;
+    }
+
+
+    public Integer getProcessNum() {
         return processNum;
     }
 
-    public void setProcessNum(int processNum) {
+    public void setProcessNum(Integer processNum) {
         this.processNum = processNum;
     }
 
-    public int getHasOutNum() {
+    public Integer getHasOutNum() {
         return hasOutNum;
     }
 
-    public void setHasOutNum(int hasOutNum) {
+    public void setHasOutNum(Integer hasOutNum) {
         this.hasOutNum = hasOutNum;
     }
 
-    public BigDecimal getStorageNum() {
+    public Integer getStorageNum() {
         return storageNum;
     }
 
-    public void setStorageNum(BigDecimal storageNum) {
+    public void setStorageNum(Integer storageNum) {
         this.storageNum = storageNum;
     }
 
-    public int getHasPickNum() {
+    public Integer getHasPickNum() {
         return hasPickNum;
     }
 
-    public void setHasPickNum(int hasPickNum) {
+    public void setHasPickNum(Integer hasPickNum) {
         this.hasPickNum = hasPickNum;
     }
 
-    public String getMaterialModel() {
-        return materialModel;
-    }
-
-    public void setMaterialModel(String materialModel) {
-        this.materialModel = materialModel;
-    }
-
-    public int getOrderNum() {
+    public Integer getOrderNum() {
         return orderNum;
     }
 
-    public void setOrderNum(int orderNum) {
+    public void setOrderNum(Integer orderNum) {
         this.orderNum = orderNum;
     }
 
-    public Date getDeliveryTime() {
-        return deliveryTime;
-    }
-
-    public void setDeliveryTime(Date deliveryTime) {
-        this.deliveryTime = deliveryTime;
-    }
-
-    public int getFinishNum() {
+    public Integer getFinishNum() {
         return finishNum;
     }
 
-    public void setFinishNum(int finishNum) {
+    public void setFinishNum(Integer finishNum) {
         this.finishNum = finishNum;
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderBomServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderBomServiceImpl.java
index eccf8f69..000282e5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderBomServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderBomServiceImpl.java
@@ -81,7 +81,7 @@ public class SysMakeorderBomServiceImpl implements ISysMakeorderBomService
 //            获取可用库存数
             WarehouseInventoryInquiry inquiry = inquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(bom.getMaterialNo());
             if(inquiry == null){
-                bom.setStorageNum(BigDecimal.ZERO);
+                bom.setStorageNum(0);
             }else{
                 bom.setStorageNum(inquiry.getAvailableStockNum());
             }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java
index 15b08207..d7b2b02d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java
@@ -67,27 +67,39 @@ public class WarehouseInventoryInquiry extends BaseEntity
 
     /** 物料历史总数量 */
     @Excel(name = "物料历史总数量", sort = 8)
-    private BigDecimal historicalTotal;
+    private Integer historicalTotal;
+
+    /** 共享可用库存数 */
+    private Integer sharedAvailableStockNum;
+
+    /** 固定可用库存数*/
+    private Integer fixedAvailableStockNum;
+
+    /** 锁定库存数*/
+    private Integer lockStockNum;
+
+    /** 盘亏数*/
+    private Integer stockLossesNum;
 
     /** 可用库存数 */
     @Excel(name = "可用库存数", sort = 9)
-    private BigDecimal availableStockNum;
+    private Integer availableStockNum;
 
     /** 物料归属可用库存数 */
 //    @Excel(name = "物料归属可用库存数")
-    private BigDecimal attributionAvailableStockNum;
+    private Integer attributionAvailableStockNum;
 
     /** 物料无归属可用库存数 */
 //    @Excel(name = "物料无归属可用库存数")
-    private BigDecimal noattributionAvailableStockNum;
+    private Integer noattributionAvailableStockNum;
 
     /** 物料使用数 */
     @Excel(name = "使用数", sort = 10)
-    private BigDecimal useNum;
+    private Integer useNum;
 
     /** 物料报损数 */
     @Excel(name = "报损数", sort = 11)
-    private BigDecimal reportDamageNum;
+    private Integer reportDamageNum;
 
     /** 物料使用状态（0 使用中、1 已作废） */
     @Excel(name = "使用状态", sort = 12, dictType = "useStatus")
@@ -200,61 +212,89 @@ public class WarehouseInventoryInquiry extends BaseEntity
     {
         return materialSpecification;
     }
-    public void setHistoricalTotal(BigDecimal historicalTotal)
-    {
+
+
+    public Integer getHistoricalTotal() {
+        return historicalTotal;
+    }
+
+    public void setHistoricalTotal(Integer historicalTotal) {
         this.historicalTotal = historicalTotal;
     }
 
-    public BigDecimal getHistoricalTotal()
-    {
-        return historicalTotal;
+    public Integer getSharedAvailableStockNum() {
+        return sharedAvailableStockNum;
     }
-    public void setAvailableStockNum(BigDecimal availableStockNum)
-    {
-        this.availableStockNum = availableStockNum;
+
+    public void setSharedAvailableStockNum(Integer sharedAvailableStockNum) {
+        this.sharedAvailableStockNum = sharedAvailableStockNum;
     }
 
-    public BigDecimal getAvailableStockNum()
-    {
+    public Integer getFixedAvailableStockNum() {
+        return fixedAvailableStockNum;
+    }
+
+    public void setFixedAvailableStockNum(Integer fixedAvailableStockNum) {
+        this.fixedAvailableStockNum = fixedAvailableStockNum;
+    }
+
+    public Integer getLockStockNum() {
+        return lockStockNum;
+    }
+
+    public void setLockStockNum(Integer lockStockNum) {
+        this.lockStockNum = lockStockNum;
+    }
+
+    public Integer getStockLossesNum() {
+        return stockLossesNum;
+    }
+
+    public void setStockLossesNum(Integer stockLossesNum) {
+        this.stockLossesNum = stockLossesNum;
+    }
+
+    public Integer getAvailableStockNum() {
         return availableStockNum;
     }
-    public void setAttributionAvailableStockNum(BigDecimal attributionAvailableStockNum)
-    {
-        this.attributionAvailableStockNum = attributionAvailableStockNum;
+
+    public void setAvailableStockNum(Integer availableStockNum) {
+        this.availableStockNum = availableStockNum;
     }
 
-    public BigDecimal getAttributionAvailableStockNum()
-    {
+    public Integer getAttributionAvailableStockNum() {
         return attributionAvailableStockNum;
     }
-    public void setNoattributionAvailableStockNum(BigDecimal noattributionAvailableStockNum)
-    {
-        this.noattributionAvailableStockNum = noattributionAvailableStockNum;
+
+    public void setAttributionAvailableStockNum(Integer attributionAvailableStockNum) {
+        this.attributionAvailableStockNum = attributionAvailableStockNum;
     }
 
-    public BigDecimal getNoattributionAvailableStockNum()
-    {
+    public Integer getNoattributionAvailableStockNum() {
         return noattributionAvailableStockNum;
     }
-    public void setUseNum(BigDecimal useNum)
-    {
-        this.useNum = useNum;
+
+    public void setNoattributionAvailableStockNum(Integer noattributionAvailableStockNum) {
+        this.noattributionAvailableStockNum = noattributionAvailableStockNum;
     }
 
-    public BigDecimal getUseNum()
-    {
+    public Integer getUseNum() {
         return useNum;
     }
-    public void setReportDamageNum(BigDecimal reportDamageNum)
-    {
-        this.reportDamageNum = reportDamageNum;
+
+    public void setUseNum(Integer useNum) {
+        this.useNum = useNum;
     }
 
-    public BigDecimal getReportDamageNum()
-    {
+    public Integer getReportDamageNum() {
         return reportDamageNum;
     }
-    public void setMaterialUseStatus(String materialUseStatus) 
+
+    public void setReportDamageNum(Integer reportDamageNum) {
+        this.reportDamageNum = reportDamageNum;
+    }
+
+    public void setMaterialUseStatus(String materialUseStatus)
     {
         this.materialUseStatus = materialUseStatus;
     }
@@ -307,6 +347,10 @@ public class WarehouseInventoryInquiry extends BaseEntity
             .append("materialModel", getMaterialModel())
             .append("materialSpecification", getMaterialSpecification())
             .append("historicalTotal", getHistoricalTotal())
+            .append("sharedAvailableStockNum", getSharedAvailableStockNum())
+            .append("fixedAvailableStockNum", getFixedAvailableStockNum())
+            .append("lockStockNum", getLockStockNum())
+            .append("stockLossesNum", getStockLossesNum())
             .append("availableStockNum", getAvailableStockNum())
             .append("attributionAvailableStockNum", getAttributionAvailableStockNum())
             .append("noattributionAvailableStockNum", getNoattributionAvailableStockNum())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java
index 9742b786..56af7099 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java
@@ -55,11 +55,11 @@ public class WarehouseInventoryReportDamage extends BaseEntity
 
     /** 物料数合计 */
     @Excel(name = "物料数合计")
-    private int materialTotal;
+    private Integer materialTotal;
 
     /** 数量合计 */
     @Excel(name = "数量合计")
-    private BigDecimal numTotal;
+    private Integer numTotal;
 
     /** 仓库ID */
     @Excel(name = "仓库ID")
@@ -198,25 +198,25 @@ public class WarehouseInventoryReportDamage extends BaseEntity
     {
         return materialName;
     }
-    public void setMaterialTotal(int materialTotal)
-    {
-        this.materialTotal = materialTotal;
-    }
 
-    public int getMaterialTotal()
-    {
+
+    public Integer getMaterialTotal() {
         return materialTotal;
     }
-    public void setNumTotal(BigDecimal numTotal)
-    {
-        this.numTotal = numTotal;
+
+    public void setMaterialTotal(Integer materialTotal) {
+        this.materialTotal = materialTotal;
     }
 
-    public BigDecimal getNumTotal()
-    {
+    public Integer getNumTotal() {
         return numTotal;
     }
-    public void setWarehouseCode(String warehouseCode) 
+
+    public void setNumTotal(Integer numTotal) {
+        this.numTotal = numTotal;
+    }
+
+    public void setWarehouseCode(String warehouseCode)
     {
         this.warehouseCode = warehouseCode;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java
index 81bea8e1..f579c2e8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java
@@ -59,7 +59,7 @@ public class WarehouseInventoryReportDamageChild extends BaseEntity
 
     /** 实际报废数量 */
     @Excel(name = "实际报废数量", sort = 6)
-    private BigDecimal actualScrapQuantity;
+    private Integer actualScrapQuantity;
 
     /** 报废类型 */
     @Excel(name = "报废类型", sort = 8)
@@ -189,16 +189,16 @@ public class WarehouseInventoryReportDamageChild extends BaseEntity
     {
         return materialBrand;
     }
-    public void setActualScrapQuantity(BigDecimal actualScrapQuantity) 
-    {
-        this.actualScrapQuantity = actualScrapQuantity;
-    }
 
-    public BigDecimal getActualScrapQuantity() 
-    {
+    public Integer getActualScrapQuantity() {
         return actualScrapQuantity;
     }
-    public void setScrapType(String scrapType) 
+
+    public void setActualScrapQuantity(Integer actualScrapQuantity) {
+        this.actualScrapQuantity = actualScrapQuantity;
+    }
+
+    public void setScrapType(String scrapType)
     {
         this.scrapType = scrapType;
     }
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 92c41a3b..6e8966d1 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
@@ -195,7 +195,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
         String loginName = ShiroUtils.getLoginName();
         warehouseInventoryReportDamage.setCreateBy(loginName);
         warehouseInventoryReportDamage.setCreateTime(DateUtils.getNowDate());
-        BigDecimal sumTotal = BigDecimal.ZERO;
+        Integer sumTotal = 0;
        //报损子表数据
         //判断子表数据是否为空
         if(StringUtils.isNotEmpty(warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList())){
@@ -206,7 +206,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
                     throw new BusinessException("物料"+reportDamageChild.getMaterialNo()+"库存查询记录为空！请检查");
                 }
                 //子表数据不为空，则插入子表数据
-                sumTotal = sumTotal.add(reportDamageChild.getActualScrapQuantity());
+                sumTotal += reportDamageChild.getActualScrapQuantity();
                 reportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo());
                 reportDamageChild.setReportDamageCode(newCode);
                 if(warehouseInventoryReportDamage.getApplyTime()!=null){
@@ -242,12 +242,12 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
         if(detailInsertResult<=0){
             throw new BusinessException("新增库存历史失败！");
         }
-        BigDecimal reportDamageNum = inventoryInquiry.getReportDamageNum();
-        reportDamageNum = reportDamageNum.add(damageChild.getActualScrapQuantity());
-        inventoryInquiry.setReportDamageNum(reportDamageNum);
-        BigDecimal availableNum = inventoryInquiry.getAvailableStockNum();
-        availableNum = availableNum.subtract(damageChild.getActualScrapQuantity());
-        inventoryInquiry.setAvailableStockNum(availableNum);
+//        BigDecimal reportDamageNum = inventoryInquiry.getReportDamageNum();
+//        reportDamageNum = reportDamageNum.add(damageChild.getActualScrapQuantity());
+//        inventoryInquiry.setReportDamageNum(reportDamageNum);
+//        BigDecimal availableNum = inventoryInquiry.getAvailableStockNum();
+//        availableNum = availableNum.subtract(damageChild.getActualScrapQuantity());
+//        inventoryInquiry.setAvailableStockNum(availableNum);
         inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName());
         inventoryInquiry.setUpdateTime(DateUtils.getNowDate());
         return inventoryInquiryMapper.updateWarehouseInventoryInquiry(inventoryInquiry);
@@ -264,7 +264,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
 //        inquiryDetail.setMaterialUnit(damageChild.getMaterialUnit());
 //        inquiryDetail.setMaterialType(damageChild.getMaterialType());
         inquiryDetail.setInventoryIncreaseDecrease("0");
-        BigDecimal decreaseNum = damageChild.getActualScrapQuantity();
+        Integer decreaseNum = damageChild.getActualScrapQuantity();
 //        inquiryDetail.setAvailableStockNum(decreaseNum);
         inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate());
         inquiryDetail.setCreateBy(ShiroUtils.getLoginName());
@@ -283,13 +283,13 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
         String loginName = ShiroUtils.getLoginName();
         warehouseInventoryReportDamage.setUpdateBy(loginName);
         warehouseInventoryReportDamage.setUpdateTime(DateUtils.getNowDate());
-        BigDecimal sumTotal = BigDecimal.ZERO;
+        Integer sumTotal = 0;
         if(StringUtils.isNotEmpty(warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList())){
             //清除现在的子表信息
             warehouseInventoryReportDamageChildService.deleteWarehouseInventoryReportDamageChildByCode(warehouseInventoryReportDamage.getReportDamageCode());
             for(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild:warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList()){
                 //子表数据不为空，则插入子表数据
-                sumTotal = sumTotal.add(warehouseInventoryReportDamageChild.getActualScrapQuantity());
+                sumTotal += warehouseInventoryReportDamageChild.getActualScrapQuantity();
                 warehouseInventoryReportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo());
                 warehouseInventoryReportDamageChild.setReportDamageCode(warehouseInventoryReportDamage.getReportDamageCode());
                 warehouseInventoryReportDamageChild.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 c7969ed7..633d0bb2 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
@@ -568,16 +568,16 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
     //    更新物料对应库存查询记录
     public int updateWarehouseInventoryInquiry(WarehouseOutOrderDetail outOrderDetail,WarehouseInventoryInquiry inventoryInquiry){
 //              更新可用库存数
-        BigDecimal stockNum = inventoryInquiry.getAvailableStockNum();
-        if((stockNum.compareTo(BigDecimal.ZERO) <= 0)){
+        Integer stockNum = inventoryInquiry.getAvailableStockNum();
+        if(stockNum <= 0){
             throw new BusinessException("出库失败！该物料无可用库存数");
         }
         int outNum = outOrderDetail.getActualOutOrderSum();
-        stockNum = stockNum.subtract(BigDecimal.valueOf(outNum));
+        stockNum -= outNum;
         inventoryInquiry.setAvailableStockNum(stockNum);
 //              更新使用数
-        BigDecimal useNum = inventoryInquiry.getUseNum();
-        useNum = useNum.add(BigDecimal.valueOf(outNum));
+        Integer useNum = inventoryInquiry.getUseNum();
+        useNum += outNum;
         inventoryInquiry.setUseNum(useNum);
 
         inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName());
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 6b1ac73f..440a6a1a 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
@@ -736,11 +736,11 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
         }
         //查询该物料报损数，更新库存查询报损数
         List<WarehouseInventoryReportDamageChild> damageChildren = damageChildMapper.selectWarehouseInventoryReportDamageChildByMaterialNo(materialNo);
-        BigDecimal scrapSum = BigDecimal.ZERO;
+        Integer scrapSum = 0;
         if(StringUtils.isNotEmpty(damageChildren)){
             for (WarehouseInventoryReportDamageChild damageChild:damageChildren) {
-                BigDecimal scrapNum = damageChild.getActualScrapQuantity();
-                scrapSum = scrapSum.add(scrapSum);
+                Integer scrapNum = damageChild.getActualScrapQuantity();
+                scrapSum += scrapSum;
             }
         }
 //      存在库存查询记录，更新可用库存数
@@ -748,14 +748,14 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
             WarehouseInventoryInquiry inventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo);
 //      增加可用库存数
             Integer storage = warehouseStorageOrderDetail.getStorageNum();
-            BigDecimal storagenum = BigDecimal.valueOf(storage);
-            BigDecimal avaliableStorage = inventoryInquiry.getAvailableStockNum();
-            avaliableStorage = avaliableStorage.add(storagenum);
+            Integer storagenum = storage;
+            Integer avaliableStorage = inventoryInquiry.getAvailableStockNum();
+            avaliableStorage += storagenum;
             inventoryInquiry.setAvailableStockNum(avaliableStorage);
             inventoryInquiry.setReportDamageNum(scrapSum);
 //      设置历史总数
-            BigDecimal historicalTotal = inventoryInquiry.getHistoricalTotal();
-            historicalTotal = historicalTotal.add(storagenum);
+            Integer historicalTotal = inventoryInquiry.getHistoricalTotal();
+            historicalTotal += storagenum;
             inventoryInquiry.setHistoricalTotal(historicalTotal);
             inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName());
             inventoryInquiry.setUpdateTime(DateUtils.getNowDate());
@@ -771,7 +771,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
             inventoryInquiry.setMaterialType(warehouseStorageOrderDetail.getMaterialType());
             inventoryInquiry.setMaterialProcessMethod(warehouseStorageOrderDetail.getMaterialProcessMethod());
             Integer storage = warehouseStorageOrderDetail.getStorageNum();
-            BigDecimal storagenum = BigDecimal.valueOf(storage);
+            Integer storagenum = storage;
             //      设置历史总数
             inventoryInquiry.setHistoricalTotal(storagenum);
             inventoryInquiry.setAvailableStockNum(storagenum);
diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml
index d2c6b79f..02da5d15 100644
--- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml
@@ -18,6 +18,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialSpecification"            column="material_specification"    />
         <result property="warehouseDept"                    column="warehouse_dept"    />
         <result property="historicalTotal"                  column="historical_total"    />
+        <result property="sharedAvailableStockNum"          column="shared_available_stock_num"/>
+        <result property="lockStockNum"                     column="lock_stock_num"    />
+        <result property="fixedAvailableStockNum"           column="fixed_available_stock_num"    />
+        <result property="stockLossesNum"                   column="stock_losses_num"    />
         <result property="availableStockNum"                column="available_stock_num"    />
         <result property="attributionAvailableStockNum"     column="attribution_available_stock_num"    />
         <result property="noattributionAvailableStockNum"   column="noattribution_available_stock_num"    />
@@ -35,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select inventory_inquiry_id, material_no, material_name, material_type,
                material_photoUrl, material_brand, material_unit, material_describe,
                material_process_method, material_model, material_specification,warehouse_dept,
-               historical_total, available_stock_num, attribution_available_stock_num,
+               historical_total, shared_available_stock_num, lock_stock_num, fixed_available_stock_num, stock_losses_num,available_stock_num, attribution_available_stock_num,
                noattribution_available_stock_num, use_num, report_damage_num, material_use_status,
                remark, create_time, create_by, update_by, update_time
         from warehouse_inventory_inquiry
@@ -83,6 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialSpecification != null">material_specification,</if>
             <if test="warehouseDept != null">warehouse_dept,</if>
             <if test="historicalTotal != null">historical_total,</if>
+            <if test="sharedAvailableStockNum != null">shared_available_stock_num,</if>
+            <if test="lockStockNum != null">lock_stock_num,</if>
+            <if test="fixedAvailableStockNum != null">fixed_available_stock_num,</if>
+            <if test="stockLossesNum != null">stock_losses_num,</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>
@@ -108,6 +116,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialSpecification != null">#{materialSpecification},</if>
             <if test="warehouseDept != null">#{warehouseDept},</if>
             <if test="historicalTotal != null">#{historicalTotal},</if>
+            <if test="sharedAvailableStockNum != null">#{sharedAvailableStockNum},</if>
+            <if test="lockStockNum != null">#{lockStockNum},</if>
+            <if test="fixedAvailableStockNum != null">#{fixedAvailableStockNum},</if>
+            <if test="stockLossesNum != null">#{stockLossesNum},</if>
             <if test="availableStockNum != null">#{availableStockNum},</if>
             <if test="attributionAvailableStockNum != null">#{attributionAvailableStockNum},</if>
             <if test="noattributionAvailableStockNum != null">#{noattributionAvailableStockNum},</if>
@@ -137,6 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialSpecification != null">material_specification = #{materialSpecification},</if>
             <if test="warehouseDept != null">warehouse_dept = #{warehouseDept},</if>
             <if test="historicalTotal != null">historical_total = #{historicalTotal},</if>
+            <if test="sharedAvailableStockNum != null">shared_available_stock_num = #{sharedAvailableStockNum},</if>
+            <if test="lockStockNum != null">lock_stock_num = #{lockStockNum},</if>
+            <if test="fixedAvailableStockNum != null">fixed_available_stock_num = #{fixedAvailableStockNum},</if>
+            <if test="stockLossesNum != null">stock_losses_num = #{stockLossesNum},</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>