Merge branch 'dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java

@@ -71,4 +71,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 	Integer findSignNumByLoadIdAndNodeIdAndOrderCodeAndeWaybillNo(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo);
 
 	Integer findRealSignNumBySignOrderId(@Param("signOrderId") Long signOrderId);
+
+	void updateFinalNodeIdAndFinalNodeNameById(@Param("loadScanId") Long loadScanId, @Param("finalNodeId") Long finalNodeId, @Param("finalNodeName") String finalNodeName);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -281,4 +281,10 @@
         where sign_order_id = #{signOrderId}
     </select>
 
+    <update id="updateFinalNodeIdAndFinalNodeNameById">
+        update logpm_trunkline_cars_load_scan
+        set final_node_id = #{finalNodeId},
+            final_node_name = #{finalNodeName}
+        where id = #{loadScanId}
+    </update>
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java

@@ -67,4 +67,7 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
     List<TrunklineCarsLoadScanEntity> findListByIds(List<Long> loadScanIds);
 
 	Integer findRealSignNumBySignOrderId(Long signOrderId);
+
+	void updateFinalNodeIdAndFinalNodeNameById(Long loadScanId, Long finalNodeId, String finalNodeName);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java

@@ -162,4 +162,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findRealSignNumBySignOrderId(signOrderId);
 	}
 
+	@Override
+	public void updateFinalNodeIdAndFinalNodeNameById(Long loadScanId, Long finalNodeId, String finalNodeName) {
+		baseMapper.updateFinalNodeIdAndFinalNodeNameById(loadScanId,finalNodeId,finalNodeName);
+	}
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -1776,7 +1776,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					isAbnormal = 0;
 					remark = "正常装车";
 				}
-				carsLoadScanEntity.setFinalNodeId(carsOrderEntity.getFinalNodeId());
+				Long finalNodeId = carsOrderEntity.getFinalNodeId();
+				BasicdataWarehouseEntity finalNode = basicdataWarehouseClient.getEntityWarehouseId(finalNodeId);
+				String finalNodeName = null;
+				if(!Objects.isNull(finalNode)){
+					finalNodeName = finalNode.getName();
+				}
+				carsLoadScanEntity.setFinalNodeId(finalNodeId);
+				carsLoadScanEntity.setFinalNodeName(finalNodeName);
 			}
 			distributionParcelListClient.updateOrderPackageCodeById(packageId,"60");
 			distributionStockArticleClient.submitHandleNumByOrderId(1,articleId);
@@ -1852,6 +1859,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Integer isData = 1;
 		Integer planNum = null;
 		Integer difficult = 0;
+		Long finalNodeId = null;
+		String finalNodeName = null;
 		String loadCode = carsLoadEntity.getCarsNo();
 		//判断订单是否在计划当中
 		QueryWrapper<TrunklineCarsOrderEntity> queryWrapper = new QueryWrapper<>();
@@ -1864,6 +1873,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			isAbnormal = 1;
 			remark = "有数据,无计划,异常装车";
 		}else{
+			finalNodeId = carsOrderEntity.getFinalNodeId();
+			BasicdataWarehouseEntity finalNode = basicdataWarehouseClient.getEntityWarehouseId(finalNodeId);
+			if(!Objects.isNull(finalNode)){
+				finalNodeName = finalNode.getName();
+			}
 			planNum = carsOrderEntity.getPlanNum();//计划件数
 		}
 
@@ -1910,7 +1924,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			carsLoadScanEntity.setTrayCode(trayCode);
 			carsLoadScanEntity.setRemark(remark);
 			carsLoadScanEntity.setFromWarehouseId(warehouseId);
-			carsLoadScanEntity.setFinalNodeId(carsOrderEntity.getFinalNodeId());
+			carsLoadScanEntity.setFinalNodeId(finalNodeId);
+			carsLoadScanEntity.setFinalNodeName(finalNodeName);
 			trunklineCarsLoadScanService.save(carsLoadScanEntity);
 			loadScanId = carsLoadScanEntity.getId();
 			difficult = enterNum;
@@ -2406,7 +2421,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		for (LoadScanFinalNodeIdVO loadScanFinalNodeIdVO : loadScanFinalNodeIdList) {
 			Long loadScanId = loadScanFinalNodeIdVO.getLoadScanId();
 			Long finalNodeId = loadScanFinalNodeIdVO.getFinalNodeId();
-			trunklineCarsLoadScanService.updateFinalNodeIdById(loadScanId,finalNodeId);
+			String finalNodeName = null;
+			BasicdataWarehouseEntity finalNode = basicdataWarehouseClient.getEntityWarehouseId(finalNodeId);
+			if(!Objects.isNull(finalNode)){
+				finalNodeName = finalNode.getName();
+			}
+			trunklineCarsLoadScanService.updateFinalNodeIdAndFinalNodeNameById(loadScanId,finalNodeId,finalNodeName);
 		}
 
 
@@ -3646,6 +3666,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String orderCode = carsLoadScanEntity.getOrderCode();
 			Long loadScanId = carsLoadScanEntity.getId();
 			Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId();
+			Integer isData = carsLoadScanEntity.getIsData();
 			Integer isAbnormal = 0;
 			if(warehouseId.equals(finalNodeId)){
 				carsLoadScanEntity.setUnloadAbnormal(0);
@@ -3672,7 +3693,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			trunklineCarsUnloadLogService.savaUnloadLog(warehouseId,warehouseName,loadId,loadCode,waybillId,waybillNo,orderCode,orderPackageCode,1,
 				1,1,isAbnormal,trayId,trayCode,trayName,fromWarehouseId,loadScanId,remark);
 
-
+			if(1 == isData){
 				DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, fromWarehouseId);
 				if(Objects.isNull(parcelListEntity)){
 					log.warn("##############unloadPackage: 包件信息不存在 orderPackageCode={} fromWarehouseId={}",orderPackageCode,fromWarehouseId);
@@ -3749,6 +3770,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					distributionParcelListClient.updateOrderPackageCodeById(packageId,packageStatus);
 				}
 			}
+		}
 		updateNumByLoadId(loadId);
 
 		return R.success("卸车成功");