From a2854553a1bc412bfda61450134834174ebd6f23 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 16 Oct 2024 20:11:44 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=B9=B2?=
 =?UTF-8?q?=E7=BA=BF=E6=B5=8B=E8=AF=95=E9=81=87=E5=88=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/trunkline/vo/UnloadPackageVO.java   |  2 ++
 .../controller/CarsLoadController.java        | 24 +++++++++++--------
 .../mapper/TrunklineCarsLoadMapper.xml        |  9 -------
 .../mapper/TrunklineCarsLoadScanMapper.xml    |  2 ++
 .../TrunklineAdvanceDetailServiceImpl.java    |  2 +-
 .../impl/TrunklineCarsLoadServiceImpl.java    | 21 ++++++++++++----
 6 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java
index 52e15fb7c..d640d8839 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java
@@ -15,6 +15,8 @@ public class UnloadPackageVO implements Serializable {
 	private Integer unloadNum;
 	private String trayName;
 	private String trayCode;
+	private String unloadTrayName;
+	private String unloadTrayCode;
 	private String scanStatus;
 	private String unloadNodeName;
 	private String orderCode;
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
index 8655b7178..f201e98a2 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
@@ -88,17 +88,21 @@ public class CarsLoadController {
 
 			//当前登录人选择的仓库
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-			List<Long> warehouseIds = new ArrayList<>();
-			if(!Objects.isNull(myCurrentWarehouse)){
-				Long warehouseId = myCurrentWarehouse.getId();
-				warehouseIds.add(warehouseId);
-			}else{
-				List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
-				myWatchWarehouse.forEach(warehouseEntity -> {
-					warehouseIds.add(warehouseEntity.getId());
-				});
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(400,"多仓权限无法操作，请选择仓库");
 			}
-			loadCarsDTO.setWarehouseIds(warehouseIds);
+//			List<Long> warehouseIds = new ArrayList<>();
+//			if(!Objects.isNull(myCurrentWarehouse)){
+//				Long warehouseId = myCurrentWarehouse.getId();
+//				warehouseIds.add(warehouseId);
+//			}else{
+//				List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
+//				myWatchWarehouse.forEach(warehouseEntity -> {
+//					warehouseIds.add(warehouseEntity.getId());
+//				});
+//			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
 
 			IPage<TrunklineCarsLoadVO> pages = carsLoadService.arriveCarsPageList(loadCarsDTO);
 			return R.data(pages);
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 2e6db992c..047a58c1c 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
@@ -141,18 +141,9 @@
         where ltcl.is_deleted = 0
         and ltcl.load_status != '100'
         and ltcl.load_type != '4'
-        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0" >
-            and ltcl.start_warehouse_id in
-            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
         <if test="param.warehouseId != null" >
             and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%')
         </if>
-        <if test="param.endWarehouseId != null" >
-            and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0
-        </if>
         <if test="param.warehouseName != null and param.warehouseName != ''">
             and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0)
         </if>
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 3723792f0..fbc939a8e 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
@@ -940,6 +940,8 @@
                unload_num unloadNum,
                tray_code trayCode,
                tray_name trayName,
+                unload_tray_code unloadTrayCode,
+                unload_tray_name unloadTrayName,
                scan_status scanStatus,
                unload_node_name unloadNodeName,
                order_code orderCode,
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
index 2d667f043..2c6bf4a54 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
@@ -216,7 +216,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 			String filename = QRCodeUtil.createCodeToFile(vo.getQrCode());
 			map.put("img", QRCodeUtil.getEmpAutograph(filename));
 			// 订单号 生成二维码
-			String fileTypeName = QRCodeUtil.createCodeToFile(vo.getQrCode());
+			String fileTypeName = QRCodeUtil.createCodeToFile(vo.getOrderCode());
 			map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName));
 			data.add(map);
 			String tempData = TemplateUtil.popTemplate(template.getTemplateName(), map, orderPackgeCodeDataVO.getTemplateHtml());
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 2c6e7a2a6..1099c1e55 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
@@ -7895,7 +7895,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		JSONObject abnormalRecord = abnormalRecordClient.findListByCarsNoAndUpWarehouseId(carsNo, warehouseId);
 
-		map.put("three", "当前待处理异常 " + abnormalRecord.getInteger("dealwithNum") + " 条、已处理异常 " + abnormalRecord.getInteger("noDealwithNum") + " 条");
+		if(abnormalRecord != null){
+			map.put("three", "当前待处理异常 " + abnormalRecord.getInteger("dealwithNum") + " 条、已处理异常 " + abnormalRecord.getInteger("noDealwithNum") + " 条");
+		}
+
 
 		return R.data(map);
 	}
@@ -8486,7 +8489,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			Integer realLoadingNumber = trunklineCarsLoadVO.getRealLoadingNumber();
 			Integer unloadNumber = trunklineCarsLoadVO.getUnloadNumber();
-			trunklineCarsLoadVO.setRealLoadingNumber(realLoadingNumber - unloadNumber);
+			int stockCarNumber = realLoadingNumber - unloadNumber;
+			trunklineCarsLoadVO.setRealLoadingNumber(stockCarNumber<0?0:stockCarNumber);
 			trunklineCarsLoadVO.setTotalLoadingNum(realLoadingNumber);
 		}
 		pageList.setRecords(records);
@@ -8920,8 +8924,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
 					trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
 					trunklineCarsLoadScanEntity.setUnloadTime(new Date());
-					trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
-					trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
+					if(isData==1){
+						trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
+						trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
+					}
 					trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
 					loadScanId = trunklineCarsLoadScanEntity.getId();
 
@@ -9085,6 +9091,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		} else {
 			String scanStatus = carsLoadScanEntity.getScanStatus();
 			if(!"1".equals(scanStatus)){
+				carsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
+				carsLoadScanEntity.setUnloadTrayName(unloadTrayName);
+				trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
 				log.warn("##############unloadPackage: 包件已卸车 orderPackageCode={}", orderPackageCode);
 				return R.fail(405, "包件已卸车");
 			}
@@ -10623,8 +10632,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		BeanUtil.copy(carsLoadEntity, trunklineCarsLoadVO);
 		Integer realLoadingNumber = trunklineCarsLoadVO.getRealLoadingNumber();
 		Integer unloadNumber = trunklineCarsLoadVO.getUnloadNumber();
+		int stockCarNumber = realLoadingNumber - unloadNumber;
+
 		trunklineCarsLoadVO.setUnloadNumber(loadLineEntity.getUnloadNumber());
-		trunklineCarsLoadVO.setRealLoadingNumber(realLoadingNumber - unloadNumber);
+		trunklineCarsLoadVO.setRealLoadingNumber(stockCarNumber<0?0:stockCarNumber);
 		trunklineCarsLoadVO.setUnloadScanOrderList(unloadScanOrderList);
 		trunklineCarsLoadVO.setUnloadZeroList(zeroList);
 		trunklineCarsLoadVO.setExceptionList(exceptionList);