From 3f88f0c909e8cb9a8e5dea123e19a7764aae2617 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 3 Jun 2024 15:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E6=89=AB=E6=8F=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListController.java   | 12 ----
 .../DistributionDeliveryListServiceImpl.java  | 60 ++++---------------
 .../DistributionReservationServiceImpl.java   | 41 ++-----------
 .../DistrilbutionBillLadingServiceImpl.java   |  6 +-
 4 files changed, 21 insertions(+), 98 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
index dee2731af..8b848b7f0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
@@ -164,7 +164,6 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList")
 	public R<IPage<DistributionParcelListVO>> packdetail(@RequestParam Map<String,Object> distributionDeliveryInfoDTO, Query query) throws ParseException {
 		IPage<DistributionParcelListVO> parcelListEntityList = distributionDeliveryListService.getPackageListByDeliverylistId(Condition.getPage(query), distributionDeliveryInfoDTO);
-//		IPage<DistributionDeliveryInfoVO> pages = distributionDeliveryInfoService.selectDistributionDeliveryInfopackdetail(Condition.getPage(query), distributionDeliveryInfoDTO);
 		return R.data(parcelListEntityList);
 	}
 
@@ -234,17 +233,6 @@ public class DistributionDeliveryListController extends BladeController {
 	}
 
 
-//	/**
-//	 * 配送管理 装车扫描(单件装车)
-//	 */
-//	@GetMapping("/singleloading")
-//	@ApiOperationSupport(order = 2)
-//	public R singleloading(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
-//		R msg	= distributionDeliveryListService.singleloading(distrilbutionloadingscanDTO);
-//		return msg;
-//	}
-
-
 	/**
 	 * 配送管理 点击发车
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 57af1bf4e..390223f36 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -2815,16 +2815,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (Func.isEmpty(myCurrentWarehouse)) {
 			return R.fail("无仓库信息!!!");
 		}
-//		if (Func.isEmpty(deliveryListDTO.getIsDeliveryDriverUpdate())){
-//			return R.fail("服务器正忙!!!");
-//		}
-		//首先对配送任务进行修改
-		//查询出配送任务的基本信息
 		DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryListDTO.getId());
 		Long deliveryListEntityId = deliveryListEntity.getId();
-//		if (deliveryListEntity.getDeliveryStatus().equals(DeliveryStatusConstant.peisongzhong.getValue())) {
-//			return R.fail("正在配送中...");
-//		}
 		if (deliveryListEntity.getDeliveryStatus().equals(DeliveryStatusConstant.yiwancheng.getValue())) {
 			return R.fail("配送已完成...");
 		}
@@ -2841,7 +2833,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				return R.fail("任务已装车联系司机滞留货物后进行司机切换...");
 			}
 		}
-
+		List<JSONObject> logs = new ArrayList<>();
 		//查询出原来配送信息的备货任务
 		DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(deliveryListEntity.getId());
 		//这里查询出该备货任务的执行情况，如果该任务处于已完成的状态需要创建新的备货任务，其他的备货状态则是进行备货任务的修改
@@ -2862,13 +2854,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				deliveryStockupInfo.setStockupArea(stockupInfo.getGoodsAreaName());
 			}
 //			---------------------------2023-09-06  取消班组职能字段维护------------------------------------
-//			if (Func.isNotEmpty(stockupInfo.getLoaderId())) {
-//				deliveryStockupInfo.setLoaderId(stockupInfo.getLoaderId());
-//				deliveryStockupInfo.setLoaderName(stockupInfo.getLoaderName());
-//			}
-//			if (Func.isNotEmpty(stockupInfo.getLoadAndUnload())) {
-//				deliveryStockupInfo.setTeamResponsibility(stockupInfo.getLoadAndUnload());
-//			}
 			if (Func.isNotEmpty(stockupInfo.getStockupDate())) {
 				deliveryStockupInfo.setStockupDate(stockupInfo.getStockupDate());
 			}
@@ -2928,7 +2913,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			clientTotal.getAndIncrement();
 			if (Func.isEmpty(oldClient.get(k))) {
 				DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
-//				reservationEntity.setWaybillNo(k);
 				reservationEntity.setReservationDate(reservationDate);
 				reservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
 				reservationEntity.setDeliveryType(DistributionTypeConstant.shangpei.getValue());
@@ -2987,9 +2971,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (Func.isNotEmpty(s.getOrderCode())) {
 						orderNumber.add(s.getOrderCode());
 					}
-//				if (Func.isNotEmpty(s.getWaybillNumber())){
-//					waybillNo.add(s.getWaybillNumber());
-//				}
 					if (Func.isNotEmpty(s.getWarehouse())) {
 						warehouseName.add(s.getWarehouse());
 					}
@@ -3043,18 +3024,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										//此时订单下的所有包件都处于预约状态，可用数为0
 										orderPackageNum.getAndAdd(dp.getQuantity());
 										//修改订单下的包件状态
-//							p.setOrderPackageReservationStatus();
 										dp.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
 										distributionParcelListService.updateById(dp);
 										distributionAsyncService.checkStockArticleReservationStatus(dp);
 										packageLockIds.add(dp.getId());
+										String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getUser().getNickName()+"商配计划配车,操作方式:新增订单勾选包件,预约任务号:"+reservationEntity.getReservationCode();
+										JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), dp.getOrderPackageCode(),content , WorkNodeEnums.PLAN_DISTRIBUTION.getCode());
+										logs.add(js);
 									}
 								}
-//							stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 							});
-//							s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
-//							s.setAvailableQuantity(0);
-//							distributionStockArticleService.updateById(s);
 						} else {
 							packageListInfo.forEach(p -> {
 								orderPackageNum.getAndAdd(p.getQuantity());
@@ -3069,7 +3048,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								distributionParcelListService.updateById(p);
 								packageLockIds.add(p.getId());
 								//这里根据包件进行订单状态的改变
-//								distributionAsyncService.checkStockArticleReservationStatus(p);
+								String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getUser().getNickName()+"商配计划配车,操作方式:新增订单系统默认可用包件,预约任务号:"+reservationEntity.getReservationCode();
+								JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), p.getOrderPackageCode(),content , WorkNodeEnums.PLAN_DISTRIBUTION.getCode());
+								logs.add(js);
 							});
 						}
 						//维护订单信息
@@ -3158,8 +3139,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				reservationEntity.setDeliveryPhone(String.join(",", consigneeMobile));
 				reservationEntity.setDeliveryAddress(String.join(",", consigneeAddress));
 				reservationEntity.setReceivingUnit(String.join(",", consignee));
-//			    reservationEntity.setWaybillId(String.join(",", waybillId));
-//				reservationEntity.setReservationDate(date);
 //			-----------------------预约信息完善----------------------------
 				reservationEntity.setDeliveryType(DistributionTypeConstant.shangpei.getValue());
 				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
@@ -3193,7 +3172,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 
 				//根据配送计划和运单号查询出该预约
-//				DistributionReservationEntity reservationEntity = baseMapper.selectReservationByDeliveryListIdAndCustomer(deliveryListEntityId, k);
 				DistributionReservationEntity reservationEntity = baseMapper.selectReservationByDeliveryListIdAndCustomerUnit(deliveryListEntityId, k);
 				DistributionSignforEntity signforEntity = distributionSignforService.getOne(Wrappers.<DistributionSignforEntity>query().lambda()
 					.eq(DistributionSignforEntity::getReservationId, reservationEntity.getId())
@@ -3217,9 +3195,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (Func.isNotEmpty(s.getOrderCode())) {
 						orderNumber.add(s.getOrderCode());
 					}
-//				if (Func.isNotEmpty(s.getWaybillNumber())){
-//					waybillNo.add(s.getWaybillNumber());
-//				}
 					if (Func.isNotEmpty(s.getWarehouse())) {
 						warehouseName.add(s.getWarehouse());
 					}
@@ -3269,7 +3244,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 									distributionParcelListService.updateById(p);
 									packageLockIds.add(p.getId());
 									//这里根据包件进行订单状态的改变
-//									distributionAsyncService.checkStockArticleReservationStatus(p);
+									String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getUser().getNickName()+"商配计划配车,操作方式:操作已选订单包件,预约任务号:"+reservationEntity.getReservationCode();
+									JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), p.getOrderPackageCode(),content , WorkNodeEnums.PLAN_DISTRIBUTION.getCode());
+									logs.add(js);
 								});
 							} else {
 								//查询该订单下的所有包件信息并插入该计划中
@@ -3294,19 +3271,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 											//此时订单下的所有包件都处于预约状态，可用数为0
 											orderPackageNum.getAndAdd(dp.getQuantity());
 											//修改订单下的包件状态
-//							p.setOrderPackageReservationStatus();
 											dp.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
 											distributionParcelListService.updateById(dp);
 											distributionAsyncService.checkStockArticleReservationStatus(dp);
 											packageLockIds.add(dp.getId());
+											String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getUser().getNickName()+"商配计划配车,操作方式:操作已选订单包件,预约任务号:"+reservationEntity.getReservationCode();
+											JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), dp.getOrderPackageCode(),content , WorkNodeEnums.PLAN_DISTRIBUTION.getCode());
+											logs.add(js);
 
 										}
 									}
-//							stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 								});
-//								s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
-//								s.setAvailableQuantity(0);
-//								distributionStockArticleService.updateById(s);
 							}
 							distributionStockArticleService.maintenanceOrderInfo(s.getOrderCode(), myCurrentWarehouse.getId());
 						} else {
@@ -3381,10 +3356,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								.eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId())
 								.eq(DistributionReservationPackageEntity::getStockArticleId, s.getId())
 								.ne(DistributionReservationPackageEntity::getPacketBarStatus, "2"));
-//							List<DistributionReservationPackageEntity> distributionReservationPackageEntities = distributionReservationPackageMapper.selectList(new QueryWrapper<DistributionReservationPackageEntity>().lambda()
-//								.eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId())
-//								.eq(DistributionReservationPackageEntity::getStockArticleId, s.getId())
-//							);
 							if (Func.isEmpty(list)) {
 								log.error("###########################预约包件查询错误:{}", list);
 								log.error("###########################查询错误预约Id:{}", reservationEntity.getId());
@@ -3513,13 +3484,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								}
 							}
 						}
-						//查询出这个订单下的包件信息
-//						List<DistributionReservationPackageEntity> oldPackageList = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationEntity.getId(), reservationStockarticleEntities.get(0).getStockArticleId());
 
 						//进行预约订单中间信息的修改
 						reservationStockarticleEntity.setReservationNum(packageNum.get());
 						distributionReservationStockarticleService.updateById(reservationStockarticleEntity);
-//						oldOrder.remove(s.getId());
 						//预约订单上的包件数量维护
 						packageTotal.getAndAdd(reservationStockarticleEntity.getReservationNum());
 					}
@@ -3622,8 +3590,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					});
 					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(e.getStockArticleId());
 					distributionStockArticleService.maintenanceOrderInfo(stockArticleEntity.getOrderCode(), myCurrentWarehouse.getId());
-//					stockArticleEntity.setReservationStatus(distributionReservationPackageService.judgmentStatus(Func.copy(stockArticleEntity, DistributionStockArticleDTO.class)));
-//					distributionStockArticleService.updateById(stockArticleEntity);
 					//修改预约状态和包件状态
 				} else if (e.getIsZero().equals(IsOrNoConstant.yes.getValue())) {
 					//零担
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 7767d39bb..cb9a6e426 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -2161,27 +2161,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							distributionParcelListService.updateById(p);
 							packageLockIds.add(p.getId());
 							//这里根据包件进行订单状态的改变
-//							distributionAsyncService.checkStockArticleReservationStatus(p);
-
-
 							String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"计划商配配送,操作方式:订单选择包件,预约任务号:"+reservation.getReservationCode()+",车次号:"+distributionDeliveryListEntity.getTrainNumber();
-
-							JSONObject trunklinePackageTrackLog= new JSONObject();
-							trunklinePackageTrackLog.put("tenantId",p.getTenantId());
-							trunklinePackageTrackLog.put("createTime",new Date());
-							trunklinePackageTrackLog.put("createUser",user.getUserId());
-							trunklinePackageTrackLog.put("updateUser",user.getUserId());
-							trunklinePackageTrackLog.put("updateTime",new Date());
-							trunklinePackageTrackLog.put("isDeleted",0);
-							trunklinePackageTrackLog.put("status",1);
-							trunklinePackageTrackLog.put("createDept",reservationPackageEntity.getCreateDept());
-							trunklinePackageTrackLog.put("orderPackageCode",reservationPackageEntity.getPacketBarCode());
-							trunklinePackageTrackLog.put("warehouseId",myCurrentWarehouse.getId());
-							trunklinePackageTrackLog.put("warehouseName",myCurrentWarehouse.getName());
-							trunklinePackageTrackLog.put("workNode",WorkNodeEnums.PLAN_DISTRIBUTION.getCode());
-							trunklinePackageTrackLog.put("content",content);
-							trunklinePackageTrackLog.put("operator",AuthUtil.getUser().getNickName());
-							aaa.add(trunklinePackageTrackLog);
+							JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), p.getOrderPackageCode(), content, WorkNodeEnums.PLAN_DELIVERY.getCode());
+							aaa.add(js);
 						});
 					} else {
 						//没有进行包件选择  默认添加可配送的所有包件
@@ -2209,28 +2191,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 									//此时订单下的所有包件都处于预约状态，可用数为0
 									reservationOrderNum.getAndAdd(dp.getQuantity());
 									//修改订单下的包件状态
-//							p.setOrderPackageReservationStatus();
 									dp.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
 									distributionParcelListService.updateById(dp);
 									distributionAsyncService.checkStockArticleReservationStatus(dp);
 									packageLockIds.add(dp.getId());
 									String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"计划商配配送,操作方式:系统默认选择可用包件,预约任务号:"+reservation.getReservationCode()+",车次号:"+distributionDeliveryListEntity.getTrainNumber();
-									JSONObject trunklinePackageTrackLog= new JSONObject();
-									trunklinePackageTrackLog.put("tenantId",dp.getTenantId());
-									trunklinePackageTrackLog.put("createTime",new Date());
-									trunklinePackageTrackLog.put("createUser",user.getUserId());
-									trunklinePackageTrackLog.put("updateUser",user.getUserId());
-									trunklinePackageTrackLog.put("updateTime",new Date());
-									trunklinePackageTrackLog.put("isDeleted",0);
-									trunklinePackageTrackLog.put("status",1);
-									trunklinePackageTrackLog.put("createDept",distributionReservationPackageEntity.getCreateDept());
-									trunklinePackageTrackLog.put("orderPackageCode",distributionReservationPackageEntity.getPacketBarCode());
-									trunklinePackageTrackLog.put("warehouseId",myCurrentWarehouse.getId());
-									trunklinePackageTrackLog.put("warehouseName",myCurrentWarehouse.getName());
-									trunklinePackageTrackLog.put("workNode",WorkNodeEnums.PLAN_DISTRIBUTION.getCode());
-									trunklinePackageTrackLog.put("content",content);
-									trunklinePackageTrackLog.put("operator",AuthUtil.getUser().getNickName());
-									aaa.add(trunklinePackageTrackLog);
+									JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), dp.getOrderPackageCode(), content, WorkNodeEnums.PLAN_DELIVERY.getCode());
+									aaa.add(js);
 								}
 							}
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index a34c3593d..fea01b43a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -3130,8 +3130,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							.collect(Collectors.toList()); // 收集到新的List<String>
 
 
-						List<DistributionStockArticleEntity> distributionStockArticleEntityList = distributionStockArticleService.list(Wrappers.<DistributionStockArticleEntity>query().lambda()
-							.in(DistributionStockArticleEntity::getId, ls));
+					List<DistributionStockArticleEntity> distributionStockArticleEntityList = distributionStockArticleService.list(Wrappers.<DistributionStockArticleEntity>query().lambda()
+						.in(DistributionStockArticleEntity::getId, ls)
+						.ne(DistributionStockArticleEntity::getIsZero, "1")
+					);
 
 						List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 							.in(DistributionParcelListEntity::getStockArticleId, ls)