From 4acbd24a83bcc933e8a2ac82fb03ad2e2f6f5cf7 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 23 May 2024 10:15:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E9=87=8D=E6=96=B0=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA1=E7=9A=84=E8=80=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/comfac/service/impl/FactoryCommonServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java
index 32bd182a2..cb7a207a7 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java
@@ -129,7 +129,7 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 	@Override
 	public void extracted(String status, String unitNo, String currentWarehouseId, String operationTime, Integer trayId) {
 		log.info("#############extracted: 当前处理的数据为 status={} unitNo={} currentWarehouseId={} operationTime={} trayId={}",status,unitNo,currentWarehouseId,operationTime,trayId);
-		if ("4".equals(status) || "2".equals(status)) {
+		if ("4".equals(status) || "2".equals(status) || "1".equals(status)) {
 			//继续判断是否到达目的仓
 
 			//查询destinationWarehouse logiBillNo plantId数据

From fbe3fcf489217f6c123a5a2d5efcfa6b156fb65d Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 23 May 2024 10:20:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E5=BA=93=E5=AD=98=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IDistributionBusinessPreOrderServiceImpl.java  | 2 ++
 .../service/impl/WarehouseWarehousingEntryServiceImpl.java      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/IDistributionBusinessPreOrderServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/IDistributionBusinessPreOrderServiceImpl.java
index 22b391ddd..a5b2cb24e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/IDistributionBusinessPreOrderServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/IDistributionBusinessPreOrderServiceImpl.java
@@ -205,6 +205,8 @@ public class IDistributionBusinessPreOrderServiceImpl extends BaseServiceImpl<Di
 		queryWrapper.eq(DistributionBusinessPreOrderEntity::getInWarehouse, 1);
 		Long l = baseMapper.selectCount(queryWrapper);
 
+
+
 		return Resp.scanSuccess("扫描成功", l + "件");
 	}
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
index 4f1a7ddbf..2e4051c9a 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
@@ -377,7 +377,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 					upShelfStockDTO.setAllocationId(warehousingDetail.getAllocationId());
 					upShelfStockDTO.setIncomingBatch(entity.getIncomingBatch());
 					upShelfStockDTO.setMaterialName(entity.getDescriptionGoods());
-					upShelfStockDTO.setNum(num);
+					upShelfStockDTO.setEnterNum(num);
 					upShelfStockDTO.setWarehouseId(entity.getWarehouseId());
 					list.add(upShelfStockDTO);
 					warehouseUpdownTypeService.upShelfStockList(list,warehousingDetail.getAllocationId(),entity.getWarehouseId(),"入库单录入数量上架至"+warehousingDetail.getAllocationName()+num+"件");