From ce8a60b1de280bad391d3e21b3b1b22cd08aca20 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 18 Oct 2024 21:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/AftersalesWorkOrderMapper.xml      |  2 ++
 .../impl/AftersalesWorkOrderServiceImpl.java  |  2 --
 .../impl/DistributionStockupServiceImpl.java  |  5 +++-
 .../DistrilbutionBillLadingServiceImpl.java   | 27 ++++++++++---------
 .../impl/WarehouseConfigServiceImpl.java      |  3 ++-
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index 3e3bde05d..2a94fd6c1 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -497,6 +497,8 @@
             <if test="param.createTime != null "> and date_format(from_unixtime(lawo.create_time),'%Y-%m-%d') LIKE date_format(CONCAT('%', #{param.createTime}, '%'),'%Y-%m-%d')</if>
             <if test="param.processNumber != null and param.processNumber != ''"> and lawo.process_number LIKE CONCAT('%', #{param.processNumber}, '%')</if>
         </where>
+        GROUP BY
+        lawo.id
 
     </select>
     <select id="selectAllAftersalesWorkOrderList"
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index 7b96030a0..6c6309304 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -990,8 +990,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		} else if (ObjectUtils.isNull(workOrderStatus)) {
 			aftersalesWorkOrder.put("customerIdentification", "1");
 		}
-
-
 	}
 
 	private void updateWorkOrderForSales(Map<String, Object> aftersalesWorkOrder, Object workOrderStatus) {
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 0d5b9412b..51e8d2dc0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -59,6 +59,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springblade.common.constant.CodeDesEnum;
 import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.Inventory.InventoryStockTypeStatusConstant;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.WorkNodeEnums;
 import org.springblade.common.constant.common.IsOrNoConstant;
@@ -2389,11 +2390,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				//绑定码
 				disStockListDetail.setStockPackageCode(stockupDTO.getPacketBarCode());
 				disStockListDetail.setStockStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
+				disStockListDetail.setStockType(InventoryStockTypeStatusConstant.caiji.getValue());
 				disStockListDetail.setId(list1.get(0).getId());
+
 				break;
 			case 2:
 				//生成的扫描的包条码
-
 				//查询有没有生成的数据
 				DisStockOrdercodeRecoEntity one1 = disStockOrdercodeRecoService.getOne(Wrappers.<DisStockOrdercodeRecoEntity>query().lambda()
 					.eq(DisStockOrdercodeRecoEntity::getCode, stockupDTO.getPacketBarCode())
@@ -2404,6 +2406,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					disStockListDetail.setStockPackageCode(stockupDTO.getPacketBarCode());
 					disStockListDetail.setStockStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
 					disStockListDetail.setId(list1.get(0).getId());
+					disStockListDetail.setStockType(InventoryStockTypeStatusConstant.shengcheng.getValue());
 					//修改包件码状态
 					ordercodeRecoEntity.setCodeStatus("1");
 					ordercodeRecoEntity.setId(one1.getId());
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 a50d0964e..8dfa28cf6 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
@@ -3924,10 +3924,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			Integer integer = this.selectBillLadingPlanNum(Long.parseLong(s));
 			if (Func.isNotEmpty(ladingScanEntities)) {
 				int sum = ladingScanEntities.stream().filter(f -> "2".equals(f.getMaterialType())).mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
-				if (integer != sum) {
-					//存在资源释放操作
-					releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse, distrilbutionBillLadingEntity.getPickupBatch());
-				}
+//				if (integer != sum) {
+//					//存在资源释放操作
+//					releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse, distrilbutionBillLadingEntity.getPickupBatch());
+//				}
 				try {
 					if (sum > 0) {
 						parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet()));
@@ -4043,7 +4043,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			NodeFanoutMsg<PickUpByReCheckVO> nodeFanoutMsg = buildPickUpByReCheckVO(billLadingEntity, ladingScanEntities, myCurrentWarehouse);
 
 			iDistributionNodeWorkService.billofladingSignforCheck(nodeFanoutMsg, AuthUtil.getUser());
-
+			//推送该自提单的包件运单信息
 		}
 		// 回传工厂数据
 //		sendFactory(myCurrentWarehouse, parcelListIds);
@@ -4051,6 +4051,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return R.success("操作成功");
 	}
 
+
 	private void handleDExamineDistributionPlanLog(DistrilbutionBillLadingEntity billLadingEntity, BladeUser user, BasicdataWarehouseEntity myCurrentWarehouse,Integer num) {
 		String planContent = user.getNickName() + "在" + myCurrentWarehouse.getName()
 			+ "完成自提计划;自提计划编号:" + billLadingEntity.getPickupBatch()
@@ -4117,12 +4118,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				}
 			} else {
 				recoveryReservationZeroPackageEntities.addAll(reservationZeroPackageEntities);
-				reservationZeroPackageEntities.stream().forEach(rz -> {
-					rz.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
-					rz.setQuantity(0);
-				});
-				//进行整个品类释放
-				updateReservationZeroPackageEntities.addAll(reservationZeroPackageEntities);
+				for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) {
+					DistributionReservationZeroPackageEntity cancelEntity = new DistributionReservationZeroPackageEntity();
+					cancelEntity.setId(reservationZeroPackageEntity.getId());
+					cancelEntity.setQuantity(0);
+					cancelEntity.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
+					updateReservationZeroPackageEntities.add(cancelEntity);
+				}
 			}
 		} else {
 			return 0;
@@ -4133,7 +4135,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				DistributionParcelNumberEntity distributionParcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.<DistributionParcelNumberEntity>query().lambda()
 					.eq(DistributionParcelNumberEntity::getParcelListId, recoveryReservationZeroPackageEntity.getParcelListId())
 				);
-				distributionParcelNumberEntity.setDeliveryQuantity(distributionParcelNumberEntity.getDeliveryQuantity() - recoveryReservationZeroPackageEntity.getQuantity());
+				int i = distributionParcelNumberEntity.getDeliveryQuantity() - recoveryReservationZeroPackageEntity.getQuantity();
+				distributionParcelNumberEntity.setDeliveryQuantity(i);
 				distributionParcelNumberService.updateById(distributionParcelNumberEntity);
 				distributionParcelListService.maintenanceZerpPackageInfo(recoveryReservationZeroPackageEntity.getParcelListId());
 			}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
index f4201b891..faa1752ae 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
@@ -12,6 +12,7 @@ import com.logpm.warehouse.service.IWarehouseConfigService;
 import com.logpm.warehouse.service.IWarehouseLogService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
 import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
@@ -47,7 +48,7 @@ public class WarehouseConfigServiceImpl extends BaseServiceImpl<WarehouseConfigM
 		} else {
 			BasicdataGoodsAllocationEntity defaultGoodsAllocation = basicdataGoodsAllocationClient.findDefaultGoodsAllocation(warehouseConfigEntity.getWarehouseId());
 			BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.findEntityByQrCode(warehouseConfigEntity.getWarehouseId(), warehouseConfigEntity.getDefaultAllocation());
-			if (!Objects.isNull(defaultGoodsAllocation)) {
+			if (!Objects.isNull(defaultGoodsAllocation) || !Strings.isBlank(warehouseConfigEntity.getDefaultAllocation())) {
 				flag = basicdataGoodsAllocationClient.closeDefaultAllocation(goodsAllocationEntity.getId());
 			}
 			//关闭配置进行默认库位的清理