From 256a776621b76487378691c6a8191aacd9fc200d Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 8 Aug 2024 15:28:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/trunkline/dto/LoadCarsDTO.java  |  1 +
 .../TrunklineBillladingWaybillMapper.xml      |  1 -
 .../mapper/TrunklineCarsLoadMapper.xml        |  4 ++--
 .../mapper/TrunklineCarsLoadScanMapper.xml    |  2 +-
 .../service/impl/OpenOrderServiceImpl.java    | 21 +++++++++++--------
 .../impl/TrunklineCarsLoadServiceImpl.java    |  6 ++++--
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
index 974f8f4b9..8409a7f32 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
@@ -63,6 +63,7 @@ public class LoadCarsDTO implements Serializable {
 	private List<ProductInfoDTO> productInfoList = new ArrayList<>();
 
 
+	private String goodsName;
 	private String orderCode;
 
 	private String trayCode;
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
index 03506a31c..dd552b2ca 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
@@ -58,7 +58,6 @@
          left join logpm_warehouse_waybill lww on lww.waybill_no = ltbw.waybill_no
         where ltbw.billlading_id = #{billladingId}
         and ltbw.is_deleted = 0
-        and ltbw.real_num > 0
     </select>
 
     <update id="updateDataByBillladingWaybillId" >
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
index 5c97a077f..a9d626ec7 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
@@ -281,8 +281,8 @@
         <if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
             and lww.destination_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
         </if>
-        <if test="param.productName != null and param.productName != ''">
-            and lww.goods_name like concat('%',#{param.productName},'%')
+        <if test="param.goodsName != null and param.goodsName != ''">
+            and lww.goods_name like concat('%',#{param.goodsName},'%')
         </if>
         <if test="param.shipper != null and param.shipper != ''">
             and lww.shipper like concat('%',#{param.shipper},'%')
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
index bed836641..efd905924 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
@@ -509,7 +509,7 @@
     <select id="findUnloadLoadScanWaybillList" resultType="com.logpm.trunkline.vo.LoadScanWaybillVO">
         select waybill_no waybillNo,
                sum(num) num,
-               sum(IF(unload_node_id = null,0,unload_num)) unloadNum
+               IFNULL(sum(IF(unload_node_id = null,0,unload_num)),0) unloadNum
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
           and final_node_id = #{nodeId}
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index c6fc581b3..0c9e0f240 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -1823,15 +1823,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		Map<String, ImportStandardOuPaiDTO> importStandardOuPaiDTOMap = importStandardOuPaiDTOS.stream().collect(Collectors.toMap(ImportStandardOuPaiDTO::getOrderPackageCode, Function.identity(), (a, b) -> a));
 		List<TrunklineAdvanceDetailEntity> hasAdvanceDetailList = advanceDetailService.findListByOrderPackageCodeList(hasOrderPackageCodeList);
 		hasAdvanceDetailList.forEach(advanceDetailEntity -> {
-			ImportStandardOuPaiDTO importStandardOuPaiDTO = importStandardOuPaiDTOMap.get(advanceDetailEntity.getOrderPackageCode());
-			TrunklineAdvanceDetailEntity updateMaterialEntity = new TrunklineAdvanceDetailEntity();
-			updateMaterialEntity.setId(advanceDetailEntity.getId());
-			updateMaterialEntity.setMaterialCode(importStandardOuPaiDTO.getMaterialCode());
-			updateMaterialEntity.setMaterialName(importStandardOuPaiDTO.getMaterialName());
-			updateMaterialEntity.setFirstPackName(importStandardOuPaiDTO.getFirstsName());
-			updateMaterialEntity.setSecondPackName(importStandardOuPaiDTO.getSencodsName());
-			updateMaterialEntity.setThirdPackName(importStandardOuPaiDTO.getThirdsName());
-			updateMaterialList.add(updateMaterialEntity);
+			Long waybillId = advanceDetailEntity.getWaybillId();
+			if(Objects.isNull(waybillId)){
+				ImportStandardOuPaiDTO importStandardOuPaiDTO = importStandardOuPaiDTOMap.get(advanceDetailEntity.getOrderPackageCode());
+				TrunklineAdvanceDetailEntity updateMaterialEntity = new TrunklineAdvanceDetailEntity();
+				updateMaterialEntity.setId(advanceDetailEntity.getId());
+				updateMaterialEntity.setMaterialCode(importStandardOuPaiDTO.getMaterialCode());
+				updateMaterialEntity.setMaterialName(importStandardOuPaiDTO.getMaterialName());
+				updateMaterialEntity.setFirstPackName(importStandardOuPaiDTO.getFirstsName());
+				updateMaterialEntity.setSecondPackName(importStandardOuPaiDTO.getSencodsName());
+				updateMaterialEntity.setThirdPackName(importStandardOuPaiDTO.getThirdsName());
+				updateMaterialList.add(updateMaterialEntity);
+			}
 		});
 
 		if(CollUtil.isNotEmpty(updateMaterialList)){
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index c681e6beb..b44dc60f0 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -1814,7 +1814,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String enterTimeStartStr = loadCarsDTO.getEnterTimeStartStr();
 		String enterTimeEndStr = loadCarsDTO.getEnterTimeEndStr();
 		loadCarsDTO.setEnterTimeStart(CommonUtil.getStartByDateStr(enterTimeStartStr));
-		loadCarsDTO.setEnterTimeEnd(CommonUtil.getStartByDateStr(enterTimeEndStr));
+		loadCarsDTO.setEnterTimeEnd(CommonUtil.getEndByDateStr(enterTimeEndStr));
 
 		IPage<CarsLoadAllOrderVO> pageList = baseMapper.findAllOrderList(page, loadCarsDTO);
 		return R.data(pageList);
@@ -6478,7 +6478,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		String loadStatus = trunklineCarsLoadVO.getLoadStatus();
 		trunklineCarsLoadVO.setLoadStatus(DictBizCache.getValue(DictBizConstant.CARS_LOAD_STATUS, loadStatus));
-		trunklineCarsLoadVO.setStockCarsNum(realLoadingNumber - unloadNumber);
+		int i = realLoadingNumber - unloadNumber;
+		if(i < 0) i = 0;
+		trunklineCarsLoadVO.setStockCarsNum(i);
 		trunklineCarsLoadVO.setLoadScanOrderList(loadScanOrderList);
 		trunklineCarsLoadVO.setZeroList(zeroList);
 		trunklineCarsLoadVO.setExceptionList(exceptionList);