From ed74c0c266e8dc93441da943f7dec8fd1fd0aeac Mon Sep 17 00:00:00 2001
From: chuang <994001556@qq.com>
Date: Mon, 27 Mar 2023 15:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PurchaseorderitemServiceImpl.java    | 19 ++++++++++++----
 .../reservoirarea/ReservoirareaMapper.xml     | 11 +++++++++-
 .../supplier/SupplierinvoicesMapper.xml       |  2 +-
 .../mapper/warehouse/WareHouseMapper.xml      | 22 +++++++++++++++++--
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
index fbd1495a..66792d99 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
@@ -1604,7 +1604,8 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                 item0.setSettlement(model.getSettlement());
 //rate税率：默认为0 即13个点
                 item0.setRate("0");
-
+//            单位
+                item0.setUnit(model.getUnit());
 //amount金额：price*settlement，保留6位小数
                 item0.setAmount(new BigDecimal(model.getSalesPrice()));
 //not_amount不含税金额：price*settlement*(1 - 税率)   不含税价格为sum/1.13=price
@@ -1644,10 +1645,20 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
 //                合同id
                     entity.setContractCode(contractMEntities.get(0).getId());
+//                    合同名称
+//                    entity.setContractName(contractMEntities.get(0).getContractName());
+//                    来源系统
+                    entity.setSourceSystem("0");
+//                   是否结算
+                    entity.setIsSettle("0");
+//是否转销售
+                    entity.setIsSettle("0");
+//                    是否付款申请
+                    entity.setIsPayment("0");
 //                对方合同号
                     entity.setContractNo(contractMEntities.get(0).getContractNo());
 //                供应商、客户ID
-//                    entity.setSupplierId(contractMEntities.get(0).getCode());
+                    entity.setSupplierId(contractMEntities.get(0).getCode());
 //                        供应商名称
                     entity.setSupplierName(contractMEntities.get(0).getName());
 //                        重量
@@ -1683,7 +1694,6 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 //            生成的榜单编码
                 ActionResult pdBillNumber = bean.getBillNumber(str1);
                 model.setPoundlistNo(String.valueOf(pdBillNumber.getData()));
-
                         model.setSupplierName(contractMEntities.get(0).getName());
 //                车辆信息
                 model.setVehiclePictures(purchaseorderDTO.getCarPictures());
@@ -1698,6 +1708,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                 model.setIsExamine("1");
 //            榜单类型
                 model.setPoundType("0");
+                model.setPurchaseStatus("0");
 //            业务员默认当前操作人
                 String userId = userProvider.get().getUserId();
                 model.setBusinessId(userId);
@@ -1708,9 +1719,9 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
 //进行数据添加
 
-
             int insert = purchaseorderitemMapper.insert(purEntities);
             for (int i = 0; i < purItemEntities.size(); i++) {
+
                 Purchaseorder_item0Entity entity = purItemEntities.get(i);
                 purchaseorderItem0Mapper.insert(entity);
             }
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml
index 85fcb86c..e73fd53c 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml
@@ -9,7 +9,16 @@
 			(
 				SELECT
 					IFNULL( b.`name`, '无对应仓库' ) warehouseName,
-					count( c.material_id ) itemName,
+					count( SELECT count(ab.material_id) FROM (SELECT a.*,c.material_id  FROM
+						jg_reservoirarea a
+							LEFT JOIN jg_warehouse b ON a.warehouse_id = b.id
+							AND b.delete_mark = '0'
+							LEFT JOIN jg_receiptin_item0 c ON c.reservoirarea_id = a.id
+							AND c.delete_mark = '0'
+															  WHERE
+																  a.delete_mark = '0'
+															  GROUP BY
+																  a.id,c.material_id) ab WHERE ab.id=a.id ) itemName,
 					@num1 :=(
 		SELECT
 			ROUND(
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml
index 06586e9d..835d1037 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml
@@ -46,7 +46,7 @@
                     ROUND(IFNULL( SUM( b.gross_weight ), 0 ),6) settlemenSum,
                     ROUND(IFNULL( SUM( b.net_weight ), 0),6) weightSum,
                     ROUND(IFNULL( SUM( b.buckle_weight ), 0),6) buckleWeightSum,
-                    ROUND(IFNULL( SUM(  CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement / 1000 END), 0)) grossWeightSum,
+                    ROUND(IFNULL( SUM(  CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement / 1000 END), 0),6) grossWeightSum,
                     ROUND(IFNULL( SUM(  b.settlement*b.sales_price ), 0 ),6) salesPriceSum
                 FROM
                     jg_supplier a
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml
index ff0596a0..8e29b191 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml
@@ -8,7 +8,24 @@
 		FROM
 			(
 				SELECT
-					count( b.material_id ) itemName,
+					(SELECT
+						 COUNT(ads.material_id)
+					 FROM
+						 (
+							 SELECT
+								 aa.*,bb.material_id
+							 FROM
+								 jg_warehouse aa
+									 LEFT JOIN jg_receiptin_item0 bb ON aa.id = bb.warehouse_id
+									 AND bb.delete_mark = '0'
+							 WHERE
+								 aa.delete_mark = '0'
+							 GROUP BY
+								 aa.id,
+								 bb.material_id
+						 ) ads
+					 WHERE
+						 ads.id = a.id) itemName,
 					@num1 :=(
 		SELECT
 			ROUND(
@@ -66,7 +83,8 @@
 				WHERE
 					a.delete_mark = '0'
 				GROUP BY
-					a.id
+					a.id,
+					b.material_id
 				ORDER BY
 					a.id
 			) aaa  ${ew.customSqlSegment}