Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -2566,6 +2566,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 				throw new RuntimeException(e);
 			}
 		});
+		orderCodeDataVO.setMoldList(moldList);
 
 		return orderCodeDataVO;
 	}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -154,6 +154,40 @@ public class CarsLoadController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/editNodeInfo")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询编辑配载计划详情", notes = "传入loadCarsDTO")
+	public R editNodeInfo(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############editNodeInfo: ";
+		log.info(method+"请求参数{}",loadCarsDTO);
+		Long loadId = loadCarsDTO.getLoadId();
+
+		try{
+
+			//当前登录人选择的仓库
+//			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+//			if(Objects.isNull(myCurrentWarehouse)){
+//				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+//				return R.fail(400,"多仓权限无法操作，请选择仓库");
+//			}
+
+			if(Objects.isNull(loadId)){
+				log.warn(method+"配载id为空 loadId={}",loadId);
+				return R.fail(400,"配载id为空");
+			}
+
+			return carsLoadService.selectEditDetailByLoadIdNoXz(loadId);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
 	@ResponseBody
 	@PostMapping("/updateCarsLoadBasicData")
 	@ApiOperationSupport(order = 1)
@@ -1219,12 +1253,12 @@ public class CarsLoadController {
 		try{
 
 			//当前登录人选择的仓库
-			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-			if(Objects.isNull(myCurrentWarehouse)){
-				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
-				return R.fail(400,"多仓权限无法操作，请选择仓库");
-			}
-			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+//			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+//			if(Objects.isNull(myCurrentWarehouse)){
+//				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+//				return R.fail(400,"多仓权限无法操作，请选择仓库");
+//			}
+//			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
 
 			if(Objects.isNull(loadId)){
 				log.warn(method+"配载计划id为空 loadId={}",loadId);

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

@@ -135,7 +135,7 @@
             <if test="param.loadId != null">
                 and ltlso.load_id = #{param.loadId}
             </if>
-            <if test="param.loadCarsNo != null param.loadCarsNo != ''">
+            <if test="param.loadCarsNo != null and param.loadCarsNo != ''">
                 and ltcl.cars_no = #{param.loadCarsNo}
             </if>
             <if test="param.signStatus != null and param.signStatus == '20'">

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

@@ -19,7 +19,7 @@ public interface ICarsLoadAsyncService {
 
 	void abnormalListUnloadByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, Long loadScanId, String tenantId, Long userId, String nickName, Long firstLong);
 
-	void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String nodeName, String tenantId, Long userId, String nickName, Long firstLong);
+	void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String nodeName, String tenantId, Long userId, String nickName, Long firstLong,TrunklineCarsLoadLineEntity carsLoadLineEntity);
 
 	void dealwithAfterAbnormalPackage(String orderPackageCode, Long warehouseId, String warehouseName, String carsNo, Long userId, Long aLong, String nickName);
 

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

@@ -219,4 +219,6 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 	R findSignPhotoList(LoadCarsDTO loadCarsDTO);
 
 	R adnormalHasStock(Long carsLoadScanId, Long warehouseId);
+
+	R selectEditDetailByLoadIdNoXz(Long loadId);
 }

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

@@ -418,12 +418,11 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 	@LogpmAsync("asyncExecutor")
 	@Override
-	public void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, String tenantId, Long userId, String nickName, Long deptId) {
+	public void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, String tenantId, Long userId, String nickName, Long deptId,TrunklineCarsLoadLineEntity carsLoadLineEntity) {
 
 		log.info("################abnormalListUnloadCheckByLoadIdAndWarehouseId: 卸车报告生成开始 loadId={}",loadId);
 
 		UnloadReportVO unloadReportVO = trunklineCarsLoadScanService.findUnloadReport(loadId,warehouseId);
-		TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 		if(!Objects.isNull(carsLoadLineEntity)){
 			carsLoadLineEntity.setUnloadReportStatus(1);
 			carsLoadLineEntity.setReportOne("本次装车件数 "+unloadReportVO.getLoadingNum()+" 件，实际卸车件数 "+unloadReportVO.getUnloadNum()+" 件，计划未卸车数量 "+(unloadReportVO.getNoUnloadNum()-unloadReportVO.getNoPlanNum())+" 件");