Merge branch 'refs/heads/dev' into chenglong

blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -41,7 +41,7 @@ public class LauncherServiceImpl implements LauncherService {
 		PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
 
 		// 开启elk日志
-		PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
+//		PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
 
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -1055,7 +1055,7 @@
         logpm_distribution_stockup_info AS ldsi
         INNER JOIN logpm_distribution_stockup AS lds ON ldsi.stockup_id = lds.id
         WHERE
-        ldsi.reservation_id = #{reservationId}
+        ldsi.stock_status!=4 and ldsi.reservation_id = #{reservationId}
     </select>
     <select id="selectStockupList" resultType="com.logpm.distribution.entity.DistributionStockupEntity">
         SELECT
@@ -1098,6 +1098,7 @@
         logpm_distribution_stockup_info AS ldsi
         INNER JOIN logpm_distribution_stockup AS lds ON ldsi.stockup_id = lds.id
         WHERE
+        ldsi.stock_status!=4 and
         ldsi.reservation_id in
         <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
             #{item.id}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -303,10 +303,6 @@
                 <foreach collection="warehouseIdList" item="a" open="(" separator="," close=")">
                     #{a}
                 </foreach>
-                and ldpl.warehouse_id in
-                <foreach collection="warehouseIdList" item="a" open="(" separator="," close=")">
-                    #{a}
-                </foreach>
             </if>
 
         </where>
@@ -702,7 +698,7 @@
                  LEFT JOIN logpm_distribution_stockup lds on ldsi.stockup_id = lds.id
                  LEFT JOIN logpm_distribution_reservation_zero_package ldrzp
                            on ldrzp.reservation_id = ldsi.reservation_id
-        where ldsi.reservation_id = #{reservationId}
+        where ldsi.stock_status!=4 and ldsi.reservation_id = #{reservationId}
         GROUP BY lds.stockup_area
     </select>
 
@@ -735,7 +731,7 @@
         from logpm_distribution_stockup_info ldsi
                  LEFT JOIN logpm_distribution_stockup lds on ldsi.stockup_id = lds.id
 
-        where ldsi.reservation_id = #{reservationId}
+        where ldsi.stock_status!=4 and ldsi.reservation_id = #{reservationId}
     </select>
     <select id="selectStockupStockListDetails" resultType="com.logpm.distribution.vo.DistributionStockupSelfVO">
         select lds.stockup_area goodsAreaName,
@@ -763,7 +759,7 @@
                )                scanNum
         from logpm_distribution_stockup_info ldsi
                  LEFT JOIN logpm_distribution_stockup lds on ldsi.stockup_id = lds.id
-        where ldsi.reservation_id = #{reservationId}
+        where  ldsi.stock_status!=4 and ldsi.reservation_id = #{reservationId}
     </select>
 
 

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

@@ -5010,7 +5010,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		// 构建产品明细的表头 -- 这里目前只处理了定制品和有数据的库存品，对于零担 还没有处理
 		List<Map<String, Object>> listMapTemp = new ArrayList<>();
-
+		//统计备货数量
+		int stockNum = 0;
 		for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
 			if (StringUtils.isBlank(distributionParcelListEntity.getThirdProduct())) {
 				distributionParcelListEntity.setThirdProduct("其它");
@@ -5022,6 +5023,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			} else {
 				m.put(distributionParcelListEntity.getThirdProduct(), 1);
 			}
+			if (OrderPackageStockupStatusConstant.yibeihu.getValue().equals(distributionParcelListEntity.getOrderPackageStockupStatus())){
+				stockNum++;
+			}
 		}
 		// 加入到集合中的去 目的是为了获取分类头部
 		listMapTemp.add(m);
@@ -5060,6 +5064,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				String materialNameStr = buildMaterialNameStr(distributionParcelListEntities);
 				tempMap.put("物料名称", materialNameStr);
 				tempMap.put("签收件数", 0);
+				tempMap.put("备货件数", stockNum);
 
 
 				// 构建产品明细 --对于每一个订单

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

@@ -2610,6 +2610,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 					loadscanEntity.setSigningUser(nickName);
 					loadscanEntity.setSigningUserId(userId);
+					loadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 
 
 					distributionLoadscanService.updateById(loadscanEntity);
@@ -2680,6 +2681,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscanEntity.setOneClick(1);
 					distributionLoadscanEntity.setOneQclick(1);
 					distributionLoadscanEntity.setIsInsert(2);
+					distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 					distributionLoadscanEntity.setTrainNumber(deliveryListEntity.getTrainNumber());
 					distributionLoadscanEntity.setPackageNub(collect.get(0).getQuantity());
 					distributionLoadscanEntity.setOrderId(collect.get(0).getStockArticleId());
@@ -3394,7 +3396,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						jsonObjects.add(jsonObject);
 						warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects);
 //				Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
-						if (Func.isEmpty(loadscanEntity)) {
+						if (Func.isEmpty(loadscanEntity.getId())) {
 							//更新装车包件数和签收包件数
 							distributionLoadscanService.save(distributionLoadscanEntity);
 							loadingId = distributionLoadscanEntity.getId();
@@ -3407,9 +3409,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 						JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode(), distributionDeliveryListEntity.getTrainNumber(), parcelListEntity.getWarehouseEntryTimeEnd());
 						aaa.add(trunklinePackageTrackLog);
-						assert loadscanEntity != null;
 
-					} else {
+                    } else {
 						return Resp.scanFail("操作失败", "不属于该客户");
 					}
 

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/TrunklineCarsLoadMapper.xml

@@ -578,6 +578,7 @@
         from logpm_trunkline_cars_load_scan t
                  left join logpm_distribution_parcel_list dpl on dpl.order_package_code = t.scan_code and dpl.warehouse_id = #{warehouseId}
         where t.load_id = #{loadId}
+        and dpl.id is not null
         group by dpl.brand_name,dpl.accept_warehouse_id,dpl.order_code,dpl.waybill_number
     </select>
 

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())+" 件");