From 56d9a5f885e450755f02e6d97f8cc6e3b0da0a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= <h17602169347@163.com>
Date: Wed, 3 Jul 2024 10:55:48 +0800
Subject: [PATCH] =?UTF-8?q?7.3=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/scm/CwaccountvoucherMapper.xml     | 80 +++++++++++++++++--
 .../service/impl/CwsettlementServiceImpl.java | 24 +++---
 .../jnpf/entity/CwaccountsummaryEntity.java   | 11 +++
 .../jnpf/entity/CwaccountvoucherEntity.java   | 11 +++
 .../entity/CwsettlementsummaryEntity.java     | 11 +++
 .../cwaccount/CwaccountsummaryModel.java      | 12 +++
 .../CwsettlementsummaryModel.java             | 11 +++
 .../YunguanSaleSettlementProductModel.java    |  2 +-
 8 files changed, 141 insertions(+), 21 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml
index 835cea3e..f1e96b11 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml
@@ -112,10 +112,18 @@
         a.not_tax_price settlementPriceNo,
         a.not_tax_count settlementSubtotalNo,
         a.tax_count settlementTotal,
-        a.not_tax_count settlementTotalNo
+        a.not_tax_count settlementTotalNo,
+        a.ord_ln ordLn,
+        c.code businessCode,
+        d.document_no docmentNo,
+        e.name warehouseName,
+        (SELECT SUM(storage_number) from jg_warehousing_storage_product where product_id = a.product_id and warehousing_storage_id = d.id) storageNumber
         FROM
         jg_business_order_product_relational a
         LEFT JOIN jg_product b ON a.product_id = b.id
+        LEFT JOIN jg_business_order c on a.business_order_id = c.id
+        LEFT JOIN jg_warehousing_storage d on c.code = d.business_order_no
+        LEFT JOIN jg_business_line e on e.id = d.warehouse_id
         WHERE
         a.business_order_id IN (
         SELECT
@@ -145,10 +153,18 @@
         a.not_tax_price settlementPriceNo,
         a.not_tax_count settlementSubtotalNo,
         a.tax_count settlementTotal,
-        a.not_tax_count settlementTotalNo
+        a.not_tax_count settlementTotalNo,
+        a.ord_ln ordLn,
+        c.code businessCode,
+        d.document_no docmentNo,
+        e.name warehouseName,
+        (SELECT SUM(storage_number) from jg_warehousing_storage_product where product_id = a.product_id and warehousing_storage_id = d.id) storageNumber
         FROM
         jg_business_order_product_relational a
         LEFT JOIN jg_product b ON a.product_id = b.id
+        LEFT JOIN jg_business_order c on a.business_order_id = c.id
+        LEFT JOIN jg_warehousing_storage d on c.code = d.business_order_no
+        LEFT JOIN jg_business_line e on e.id = d.warehouse_id
         WHERE
         a.business_order_id IN (
         SELECT
@@ -178,10 +194,18 @@
         a.not_tax_price settlementPriceNo,
         a.not_tax_count settlementSubtotalNo,
         a.tax_count settlementTotal,
-        a.not_tax_count settlementTotalNo
+        a.not_tax_count settlementTotalNo,
+        a.ord_ln ordLn,
+        c.code businessCode,
+        d.document_no docmentNo,
+        e.name warehouseName,
+        (SELECT SUM(storage_number) from jg_warehousing_storage_product where product_id = a.product_id and warehousing_storage_id = d.id) storageNumber
         FROM
         jg_business_order_product_relational a
         LEFT JOIN jg_product b ON a.product_id = b.id
+        LEFT JOIN jg_business_order c on a.business_order_id = c.id
+        LEFT JOIN jg_warehousing_storage d on c.code = d.business_order_no
+        LEFT JOIN jg_business_line e on e.id = d.warehouse_id
         WHERE
         a.business_order_id IN (
         SELECT
@@ -211,10 +235,18 @@
         a.not_tax_price settlementPriceNo,
         a.not_tax_count settlementSubtotalNo,
         a.tax_count settlementTotal,
-        a.not_tax_count settlementTotalNo
+        a.not_tax_count settlementTotalNo,
+        a.ord_ln ordLn,
+        c.code businessCode,
+        d.document_no docmentNo,
+        e.name warehouseName,
+        (SELECT SUM(storage_number) from jg_warehousing_storage_product where product_id = a.product_id and warehousing_storage_id = d.id) storageNumber
         FROM
         jg_business_order_product_relational a
         LEFT JOIN jg_product b ON a.product_id = b.id
+        LEFT JOIN jg_business_order c on a.business_order_id = c.id
+        LEFT JOIN jg_warehousing_storage d on c.code = d.business_order_no
+        LEFT JOIN jg_business_line e on e.id = d.warehouse_id
         WHERE
         a.business_order_id IN (
         SELECT
@@ -244,10 +276,18 @@
         a.not_tax_price settlementPriceNo,
         a.not_tax_count settlementSubtotalNo,
         a.tax_count settlementTotal,
-        a.not_tax_count settlementTotalNo
+        a.not_tax_count settlementTotalNo,
+        a.ord_ln ordLn,
+        c.code businessCode,
+        d.document_no docmentNo,
+        e.name warehouseName,
+        (SELECT SUM(outbound_number) from jg_warehousing_outbound_product where product_id = a.product_id and warehousing_outbound_id = d.id) storageNumber
         FROM
         jg_business_order_product_relational a
         LEFT JOIN jg_product b ON a.product_id = b.id
+        LEFT JOIN jg_business_order c on a.business_order_id = c.id
+        LEFT JOIN jg_warehousing_outbound d on c.code = d.business_order_no
+        LEFT JOIN jg_business_line e on e.id = d.warehouse_id
         WHERE
         a.business_order_id IN (
         SELECT
@@ -277,10 +317,18 @@
         a.not_tax_price settlementPriceNo,
         a.not_tax_count settlementSubtotalNo,
         a.tax_count settlementTotal,
-        a.not_tax_count settlementTotalNo
+        a.not_tax_count settlementTotalNo,
+        a.ord_ln ordLn,
+        c.code businessCode,
+        d.document_no docmentNo,
+        e.name warehouseName,
+        (SELECT SUM(outbound_number) from jg_warehousing_outbound_product where product_id = a.product_id and warehousing_outbound_id = d.id) storageNumber
         FROM
         jg_business_order_product_relational a
         LEFT JOIN jg_product b ON a.product_id = b.id
+        LEFT JOIN jg_business_order c on a.business_order_id = c.id
+        LEFT JOIN jg_warehousing_outbound d on c.code = d.business_order_no
+        LEFT JOIN jg_business_line e on e.id = d.warehouse_id
         WHERE
         a.business_order_id IN (
         SELECT
@@ -310,10 +358,18 @@
         a.not_tax_price settlementPriceNo,
         a.not_tax_count settlementSubtotalNo,
         a.tax_count settlementTotal,
-        a.not_tax_count settlementTotalNo
+        a.not_tax_count settlementTotalNo,
+        a.ord_ln ordLn,
+        c.code businessCode,
+        d.document_no docmentNo,
+        e.name warehouseName,
+        (SELECT SUM(outbound_number) from jg_warehousing_outbound_product where product_id = a.product_id and warehousing_outbound_id = d.id) storageNumber
         FROM
         jg_business_order_product_relational a
         LEFT JOIN jg_product b ON a.product_id = b.id
+        LEFT JOIN jg_business_order c on a.business_order_id = c.id
+        LEFT JOIN jg_warehousing_outbound d on c.code = d.business_order_no
+        LEFT JOIN jg_business_line e on e.id = d.warehouse_id
         WHERE
         a.business_order_id IN (
         SELECT
@@ -343,10 +399,18 @@
         a.not_tax_price settlementPriceNo,
         a.not_tax_count settlementSubtotalNo,
         a.tax_count settlementTotal,
-        a.not_tax_count settlementTotalNo
+        a.not_tax_count settlementTotalNo,
+        a.ord_ln ordLn,
+        c.code businessCode,
+        d.document_no docmentNo,
+        e.name warehouseName,
+        (SELECT SUM(outbound_number) from jg_warehousing_outbound_product where product_id = a.product_id and warehousing_outbound_id = d.id) storageNumber
         FROM
         jg_business_order_product_relational a
         LEFT JOIN jg_product b ON a.product_id = b.id
+        LEFT JOIN jg_business_order c on a.business_order_id = c.id
+        LEFT JOIN jg_warehousing_outbound d on c.code = d.business_order_no
+        LEFT JOIN jg_business_line e on e.id = d.warehouse_id
         WHERE
         a.business_order_id IN (
         SELECT
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
index b0a7ef72..9313c98b 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
@@ -1030,11 +1030,11 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
             yunguanSaleSettlementProductModel.setACCOUNT_LINE_NO(i);
             yunguanSaleSettlementProductModel.setLINE_TYPE("INV");
             //采购订单号
-            yunguanSaleSettlementProductModel.setORD_NO("");
+            yunguanSaleSettlementProductModel.setORD_NO(cwsettlementsummaryModel.getBusinessCode());
             //采购订单明细行
-            yunguanSaleSettlementProductModel.setORD_LN(i);
+            yunguanSaleSettlementProductModel.setORD_LN(Integer.parseInt(cwsettlementsummaryModel.getOrdLn()));
             //采购入库单号
-            yunguanSaleSettlementProductModel.setRECEIPT_NO("");
+            yunguanSaleSettlementProductModel.setRECEIPT_NO(cwsettlementsummaryModel.getDocmentNo());
             yunguanSaleSettlementProductModel.setCONTRACT_NO(contractLEntity.getContractNumber());
             yunguanSaleSettlementProductModel.setATTRIBUTE1(contractLEntity.getContractNo());
             yunguanSaleSettlementProductModel.setITEM_CD(productWarehouseEntity.getCode());
@@ -1042,11 +1042,11 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
             yunguanSaleSettlementProductModel.setUNIT(cwsettlementsummaryModel.getSettlementUnit());
             yunguanSaleSettlementProductModel.setQUANTITY_ACCOUNT(new BigDecimal(cwsettlementsummaryModel.getSettlementSum()));
             //入库量
-            yunguanSaleSettlementProductModel.setQUANTITY_INVOICED(BigDecimal.ZERO);
+            yunguanSaleSettlementProductModel.setQUANTITY_INVOICED(cwsettlementsummaryModel.getStorageNumber());
             yunguanSaleSettlementProductModel.setTAX_RATE_CODE("VAT_IN_"+cwsettlementsummaryModel.getRate());
             yunguanSaleSettlementProductModel.setTAX_RATE(Integer.parseInt(cwsettlementsummaryModel.getRate()));
             //仓库名称
-            yunguanSaleSettlementProductModel.setSUBINVENTORY("");
+            yunguanSaleSettlementProductModel.setSUBINVENTORY(cwsettlementsummaryModel.getWarehouseName());
             yunguanSaleSettlementProductModel.setATTRIBUTE15(cwsettlementsummaryModel.getSettlementSubtotal());
             yunguanSaleSettlementProductModel.setAMOUNT(new BigDecimal(cwsettlementsummaryModel.getSettlementSubtotalNo()));
             yunguanSaleSettlementProductModel.setDESCRIPTION(cwsettlementsummaryModel.getDescription());
@@ -1166,12 +1166,12 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
                 yunguanSaleSettlementProductModel.setINVOICE_TYPE("T");
             }
             yunguanSaleSettlementProductModel.setATTRIBUTE4(String.valueOf(i));
-            //销售订单，暂时没值
-            yunguanSaleSettlementProductModel.setORD_NO("");
-            //销售订单行，暂时没值
-            yunguanSaleSettlementProductModel.setLINE_NO("");
-            //出库单行，暂时没值
-            yunguanSaleSettlementProductModel.setDORD_NO("");
+            //销售订单号
+            yunguanSaleSettlementProductModel.setORD_NO(cwsettlementsummaryModel.getBusinessCode());
+            //销售订单行号
+            yunguanSaleSettlementProductModel.setLINE_NO(cwsettlementsummaryModel.getOrdLn());
+            //出库单号
+            yunguanSaleSettlementProductModel.setDORD_NO(cwsettlementsummaryModel.getDocmentNo());
             yunguanSaleSettlementProductModel.setCONTRACT_CD(contractLEntity.getContractNumber());
             yunguanSaleSettlementProductModel.setKH_CONTR_NO(contractLEntity.getContractNo());
             yunguanSaleSettlementProductModel.setCUST_ID(subjectbasicEntity.getId());
@@ -1185,7 +1185,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
             yunguanSaleSettlementProductModel.setORD_QUANTITY(cwsettlementsummaryModel.getSettlementSum());
             yunguanSaleSettlementProductModel.setQUANTITY(cwsettlementsummaryModel.getSettlementSum());
             //出库量
-            yunguanSaleSettlementProductModel.setSTO_OUT_WGT(cwsettlementsummaryModel.getSettlementSum());
+            yunguanSaleSettlementProductModel.setSTO_OUT_WGT(cwsettlementsummaryModel.getStorageNumber());
             yunguanSaleSettlementProductModel.setUNIT(cwsettlementsummaryModel.getSettlementUnit());
             yunguanSaleSettlementProductModel.setINV_PRICE(cwsettlementsummaryModel.getSettlementPrice());
             yunguanSaleSettlementProductModel.setINV_AMT(cwsettlementsummaryModel.getSettlementSubtotal());
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountsummaryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountsummaryEntity.java
index 7c6a4809..03f1e57f 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountsummaryEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountsummaryEntity.java
@@ -82,4 +82,15 @@ public class CwaccountsummaryEntity  {
     private String departmentId;
     @TableField("ORGANIZE_JSON_ID")
     private String organizeJsonId;
+
+    @TableField("ord_ln")
+    private String ordLn;
+    @TableField("business_code")
+    private String businessCode;
+    @TableField("docment_no")
+    private String docmentNo;
+    @TableField("warehouse_name")
+    private String warehouseName;
+    @TableField("storage_number")
+    private BigDecimal storageNumber;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java
index 8378b65f..cc35ec8b 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java
@@ -142,4 +142,15 @@ public class CwaccountvoucherEntity  {
     @TableField(exist = false)
     private String notTaxCount;
 
+    @TableField(exist = false)
+    private String ordLn;
+    @TableField(exist = false)
+    private String businessCode;
+    @TableField(exist = false)
+    private String docmentNo;
+    @TableField(exist = false)
+    private String warehouseName;
+    @TableField(exist = false)
+    private BigDecimal storageNumber;
+
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java
index e3f527bb..57dc4e4d 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java
@@ -82,4 +82,15 @@ public class CwsettlementsummaryEntity  {
     private String lineNo;
     @TableField("DESCRIPTION")
     private String description;
+
+    @TableField("ord_ln")
+    private String ordLn;
+    @TableField("business_code")
+    private String businessCode;
+    @TableField("docment_no")
+    private String docmentNo;
+    @TableField("warehouse_name")
+    private String warehouseName;
+    @TableField("storage_number")
+    private BigDecimal storageNumber;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountsummaryModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountsummaryModel.java
index 103f49a5..43d525eb 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountsummaryModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountsummaryModel.java
@@ -1,5 +1,6 @@
 package jnpf.model.cwaccount;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import java.util.List;
 import java.util.Date;
@@ -66,4 +67,15 @@ public class CwaccountsummaryModel  {
     /** 备注 **/
     @JSONField(name = "remark")
     private String remark;
+
+    @JSONField(name = "ordLn")
+    private String ordLn;
+    @JSONField(name = "businessCode")
+    private String businessCode;
+    @JSONField(name = "docmentNo")
+    private String docmentNo;
+    @JSONField(name = "warehouseName")
+    private String warehouseName;
+    @JSONField(name = "storageNumber")
+    private BigDecimal storageNumber;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java
index bd81607d..ae9b0efa 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java
@@ -65,4 +65,15 @@ public class CwsettlementsummaryModel  {
     private String itemNmInv;
     @JSONField(name = "DESCRIPTION")
     private String description;
+
+    @JSONField(name = "ordLn")
+    private String ordLn;
+    @JSONField(name = "businessCode")
+    private String businessCode;
+    @JSONField(name = "docmentNo")
+    private String docmentNo;
+    @JSONField(name = "warehouseName")
+    private String warehouseName;
+    @JSONField(name = "storageNumber")
+    private BigDecimal storageNumber;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java
index 66d175a0..f59ac3df 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java
@@ -76,7 +76,7 @@ public class YunguanSaleSettlementProductModel {
     private String QUANTITY;
     /** 对应出库量 **/
     @JSONField(name = "STO_OUT_WGT")
-    private String STO_OUT_WGT;
+    private BigDecimal STO_OUT_WGT;
     /** 结算单位 **/
     @JSONField(name = "UNIT")
     private String UNIT;