From 855ca8b9eae29f68e4737cc474c9e7b0165c713d Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Fri, 8 Sep 2023 09:34:21 +0800
Subject: [PATCH 1/4] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 872e66124..2c08632c7 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
@@ -1242,7 +1242,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//	if (distrilbutionloadingscanDTO.getStockType() == 1) {
 			//查询该包条是否属于该配送任务
 			List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverywork(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
-			if (distributionLoadscanEntities.isEmpty()) {
+			if ( null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty() ) {
 				return R.fail(3001, "窜货");
 			}
 // 串货后 下面的代码执行的意义不存在
@@ -1256,7 +1256,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//TODO 托盘扫描
 			//查询该包条是否属于该配送任务
 			List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverypallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
-			if (distributionLoadscanEntities.isEmpty()) {
+			if (null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty()) {
 				return R.fail(3001, "窜货");
 			}
 			for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
@@ -1273,7 +1273,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			if (distributionReservationStockarticleEntity.getIsHaveData() == 1) {
 				//查询订单是否属于该配送任务
 				List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectOrderpallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
-				if (distributionLoadscanEntities.isEmpty()) {
+				if (null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty()) {
 					return R.fail(3001, "窜货");
 				}
 				for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
@@ -1544,7 +1544,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
 			.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 		);
-		if (distributionLoadscanEntities.isEmpty()) {
+		if (null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty()) {
 			return R.fail(3005, "该货物未装车");
 		}
 		boolean b = false;

From a286906de0ee3ed44b2bdeb8e9d193701212ee5e Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 8 Sep 2023 11:15:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E5=A4=87=E8=B4=A7=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DistributionStockupVO.java             |  1 +
 .../DistributionStockupAppController.java     | 11 ++-
 .../DistributionDeliveryDetailsMapper.xml     |  4 +-
 .../mapper/DistributionStockListMapper.xml    |  3 +-
 .../mapper/DistributionStockupMapper.java     |  2 +
 .../mapper/DistributionStockupMapper.xml      | 43 ++++++++---
 .../impl/DistributionAsyncServiceImpl.java    |  3 +
 .../impl/DistributionStockupServiceImpl.java  | 17 ++--
 .../DistrilbutionBillLadingServiceImpl.java   | 77 +++++++++++++++++--
 9 files changed, 136 insertions(+), 25 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java
index b0f219018..6d5dae340 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java
@@ -34,6 +34,7 @@ public class DistributionStockupVO extends DistributionStockupEntity {
 	private static final long serialVersionUID = 1L;
 
 	private String headline;
+	private String cargoUnit; //数量
 
 	private String groupName;
 	private String warehouseName; //仓库名称
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
index 17ae673dc..f6ef6cc0a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
@@ -569,8 +569,17 @@ public class DistributionStockupAppController extends BladeController {
 				//重复扫码
 				String audioValue7 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "7");
 				return Resp.scanFail("包条码不存在！",audioValue7);
-
+			case 8:
+				//重复扫码
+				String audioValue8 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "8");
+				return Resp.scanFail("条码已使用！",audioValue8);
+			case 9:
+				//重复扫码
+				String audioValue9 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "9");
+				return Resp.scanFail("没有待绑定的库存品信息！",audioValue9);
 			}
+
+
 		}
 			log.warn("###################stockupScan: 未知的扫码类型 scanType={}",scanType);
 			return R.fail("未知的扫码类型");
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml
index f5979c028..7b94f665e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml
@@ -60,10 +60,10 @@
 
     <select id="oneListNum" resultType="com.logpm.distribution.vo.DistributionDeliveryDetailsVO">
         select sum(lddd.quantity) wholeNum , (
-            select COUNT(1)
+            select COUNT(DISTINCT ldbls.id)
             from logpm_distribution_delivery_details ldd
                      LEFT JOIN logpm_distribution_bill_lading_scan ldbls on ldd.stock_list_id = ldbls.stock_list_id
-            where   lddd.bill_lading_id = #{id} and ldd.is_deleted = 0
+            where   ldbls.bill_lading_id = #{id} and ldd.is_deleted = 0
             ) esauNum
         from logpm_distribution_delivery_details lddd
         where lddd.bill_lading_id = #{id} and lddd.is_deleted = 0
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index 6225fc6cd..f763f9c6f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -234,7 +234,8 @@
     <select id="selectStockListInfoList" resultType="com.logpm.distribution.vo.StockListInfoListVO">
         select
                s.coding packageCode,
-               s.goods_name name
+               s.goods_name name,
+               ldsl.
 
         from logpm_distribution_reservation ldr
                  left join logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldr.id and ldrs.is_deleted = 0 and ldrs.stock_list_status in (1,3)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
index ba42881c9..0246bba90 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
@@ -168,4 +168,6 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 * @return
 	 */
 	IPage<DistributionStockupEntity> pageOweList(IPage<Object> page,@Param("param")DistributionStockupEntity distributionStockupEntity);
+
+	IPage<DistributionStockupVO> getInventoryOwnSelf(IPage<Object> page,@Param("id") Long id);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index cdc64c54f..5b39d309f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -83,6 +83,32 @@
         </where>
         GROUP BY lds.id
     </select>
+    <select id="getInventoryOwnSelf" resultType="com.logpm.distribution.vo.DistributionStockupVO">
+        select DISTINCT ldsii.sku,ldsii.cargo_unit cargoUnit,lds.stockup_status stockupStatus,lds.stockup_date stockupDate,lds.stockup_area stockupArea,ldsii.description_goods descriptionGoods
+            ,lddd.quantity reservationNum,ldsii.order_code orderCode,
+                        (
+                            select GROUP_CONCAT(DISTINCT tray_code)
+                            from logpm_warehouse_tray_goods
+                            where association_id = ldsii.id and market_id = ldsii.market_id
+                        ) pallet ,
+                        (
+                            select GROUP_CONCAT(DISTINCT position_code)
+                            from logpm_warehouse_updown_goods
+                            where association_id = ldsii.id and market_id = ldsii.market_id
+                        ) goodsAllocation,
+                        (
+                            select count(1)
+                            from logpm_distribution_stock ds
+                            WHERE ds.stock_list_id = ldsii.id  and ds.bill_lading_id = lddd.bill_lading_id
+                        )  number
+        from   logpm_distribution_stockup lds
+                   LEFT JOIN logpm_distribution_stockup_info ldsi on lds.id = ldsi.stockup_id
+                   LEFT JOIN logpm_distribution_delivery_details lddd on lddd.bill_lading_id = ldsi.reservation_id
+                   LEFT JOIN logpm_distribution_stock_list ldsii on ldsii.id = lddd.stock_list_id
+        <where>
+            ldsi.stockup_id =#{id}
+        </where>
+    </select>
     <select id="pageOweList"  resultType="com.logpm.distribution.vo.DistributionStockupVO">
         select DISTINCT lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status stockupStatus, lds.stockup_area stockupArea,
         lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName,
@@ -152,7 +178,7 @@
         where ds.id = lds.id
         ) orderNum ,
         (
-        select COUNT(ldrp.id)
+        select COUNT(DISTINCT ldrp.id)
         from logpm_distribution_stockup ds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id
         LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id  and ldrp.packet_bar_status in (1,3)
@@ -215,11 +241,11 @@
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
         where ldbs.bill_lading_id = ldsi.reservation_id)
         ) trays ,
-        (select COUNT(id)
+        (select COUNT(DISTINCT id)
         from logpm_distrilbution_bill_stock
         where bill_lading_id = ldsi.reservation_id and order_status in (1,2)  ) orderNum,
         (
-        select COUNT(ldbs.id)
+        select COUNT(DISTINCT ldbs.id)
         from  logpm_distrilbution_bill_stock ldbs
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
         where ldbs.bill_lading_id = ldsi.reservation_id
@@ -230,7 +256,7 @@
         where lddd.bill_lading_id =  ldbs.bill_lading_id
         )  inventoryNub,
         (
-        select COUNT(id)
+        select COUNT(DISTINCT id)
         from logpm_distribution_stock
         where parcel_list_id in (
         select id
@@ -238,7 +264,7 @@
         where ldbs.stock_article_id = stock_article_id
         )
         )+(
-        select COUNT(lds.id)
+        select COUNT(DISTINCT lds.id)
         from logpm_distribution_delivery_details lddd
         LEFT JOIN logpm_distribution_stock lds on lddd.stock_list_id = lds.stock_list_id
         where lds.bill_lading_id =ldbs.bill_lading_id
@@ -554,9 +580,7 @@
         where  dpl.stock_article_id = ldrsi.stocklist_id
         )
         )  number
-
         from logpm_distribution_stockup_info ldsi
-
                  LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldsi.reservation_id = ldrs.reservation_id
                  LEFT JOIN logpm_distribution_reservation_stocklist ldrsi on ldrsi.reservation_id = ldrs.reservation_id
                  LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id
@@ -589,8 +613,9 @@
         and ldsi.is_deleted = 0
     </select>
     <select id="getInventoryCheSelf" resultType="com.logpm.distribution.vo.DistributionStockupVO">
-        select lddd.quantity,ldsi.reservation_id
-        from logpm_distribution_stockup_info ldsi
+        select lddd.quantity reservationStockListNum,ldsi.reservation_id,lds.type_service
+        from logpm_distribution_stockup lds
+        LEFT JOIN logpm_distribution_stockup_info ldsi on  ldsi.stockup_id = lds.id
         LEFT JOIN logpm_distribution_delivery_details lddd on ldsi.reservation_id = lddd.bill_lading_id
         <where>
             ldsi.stockup_id =#{id} and lddd.inventory_status in (1,2)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index 8a95c1c71..6c87d6c3e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -621,6 +622,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				reservationEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue());
 			}else if (i== 0){
 				distributionStockup.setId(stockupDTO.getStockupId());
+				distributionStockup.setFixTime(new Date());
 				distributionStockup.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
 				reservationEntity.setId(stockupDTO.getReservationId());
 				reservationEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
@@ -685,6 +687,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				//改为已完成
 				//修改备货状态
 				distributionStockup.setId(stockupDTO.getStockupId());
+				distributionStockup.setFixTime(new Date());
 				distributionStockup.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
 			}
 		}else{
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 15690bfff..f4407e0d6 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
@@ -182,7 +182,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 									disStockListDetail.setWarehouseId(i.getWarehouseId());
 									disStockListDetail.setWarehouseName(i.getWarehouseName());
 									disStockListDetail.setReservationId(i.getBillLadingId());
-									disStockListDetail.setStockPackageCode("1");
+									disStockListDetail.setStockPackageStatus("1");
 									disStockListDetail.setStockListId(i.getStockListId());
 									disStockListDetail.setStockLockingStatus(StockLockingStatusConstant.wuzhuangche.getValue());
 									disStockListDetail.setStockStatus(StockStatusConstant.daibangding.getValue());
@@ -630,13 +630,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public IPage<DistributionStockupVO> getInventoryOwnSelf(IPage<Object> page, long id) {
-		IPage<DistributionStockupVO> l = new Page<>();
+		IPage<DistributionStockupVO> l = new Page<DistributionStockupVO>();
 		List<DistributionStockupVO> inventoryChe = baseMapper.getInventoryCheSelf(id);
-		if (inventoryChe.size() > 0) {
+		if (!inventoryChe.isEmpty()) {
 			boolean b = inventoryChe.stream().anyMatch(i -> ObjectUtils.isNotNull(i.getReservationStockListNum()) && i.getReservationStockListNum() > 0);
 			if (b) {
 				//查询库存品
-				return baseMapper.getInventoryOwn(page, id);
+				return baseMapper.getInventoryOwnSelf(page, id);
 			} else {
 				return l;
 			}
@@ -1074,7 +1074,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 		DisStockListDetailEntity disStockListDetail = new DisStockListDetailEntity();
 		DisStockOrdercodeRecoEntity ordercodeRecoEntity = new DisStockOrdercodeRecoEntity();
-
+		DisStockOrdercodeRecoEntity one = disStockOrdercodeRecoService.getOne(Wrappers.<DisStockOrdercodeRecoEntity>query().lambda()
+			.eq(DisStockOrdercodeRecoEntity::getCode, stockupDTO.getPacketBarCode())
+		);
+		if(ObjectUtils.isNotNull(one) && one.getCodeStatus().equals("1")){
+			return 8;
+		}
 		//查询仓库信息
 		DistributionStockListEntity byId = distributionStockListService.getById(stockupDTO.getStockListId());
 		//有 绑定 查询有没有库存品信息
@@ -1117,7 +1122,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 		} else {
 			//没有包件信息
-			return 7;
+			return 9;
 		}
 
 
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 4281ae873..34474da63 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
@@ -65,6 +65,7 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -534,10 +535,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				} else {
 					vo.setInventoryNum(0);
 				}
-				vo.setOrderNum(orderNum);
-				vo.setPlanNum(planNum);
-				vo.setSignedNum(signedNum);
-				vo.setInventoryNub(inventoryNub);
+				vo.setOrderNum(orderNum); //订单总数
+				vo.setPlanNum(planNum); //自提件数
+				vo.setSignedNum(signedNum); //签收总数
+				vo.setInventoryNub(inventoryNub); //库存品数
 			}
 			pageList.setRecords(records);
 
@@ -1043,12 +1044,76 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//查询订单数
 			List<DistrilbutionBillStockEntity> list = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
 				.eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId)
+				.apply("order_status in (1,2)")
 			);
+			AtomicReference<Integer> pake = new AtomicReference<>(0); // 包件数量
+			AtomicReference<Integer> pakeys = new AtomicReference<>(0); // 包件以扫数量
+			boolean apj = false;
+			if(list.size() > 0){
+				//查询包件数量
+				list.forEach(i ->{
+					List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+						.eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId())
+					);
+					int size = list1.size();
+					pake.set(pake.get() + size);
+					//查询扫码数量
+					List<DistributionBillLadingScanEntity> list2 = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
+						.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
+						.eq(DistributionBillLadingScanEntity::getStockArticleId, i.getStockArticleId())
+					);
+					int size2 = list2.size();
+					pakeys.set(pakeys.get() + size2);
+				});
+				if(pake.get().equals(pakeys.get()+1)){
+					//订单完成备货
+					apj = true;
+				}
+			}else{
+				//订单完成备货
+				apj = true;
+			}
+
+
 			//查询库存品数
 			List<DistributionDeliveryDetailsEntity> list1 = distributionDeliveryDetailsService.list(Wrappers.<DistributionDeliveryDetailsEntity>query().lambda()
 				.eq(DistributionDeliveryDetailsEntity::getBillLadingId, billLadingId)
 			);
-			long count = list.stream().filter(e -> e.getConditions().equals("2")).count(); // 订 已签收的数
+			//
+			AtomicReference<Integer> kcq = new AtomicReference<>(0); // 库存全部数量
+			AtomicReference<Integer> kcs = new AtomicReference<>(0); // 库存以扫数量
+			boolean kc = false;
+			if(list1.size() > 0){
+				list1.forEach( i -> {
+					//查询以扫数量
+					List<DistributionBillLadingScanEntity> list2 = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
+						.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
+						.eq(DistributionBillLadingScanEntity::getStockListId, i.getStockListId())
+					);
+					kcq.set(kcq.get()+i.getQuantity());//全部数量
+					int size = list2.size();
+					kcs.set(kcs.get()+size);//以扫数量
+				});
+					//多个
+				if(kcq.get() == (kcs.get()+1)){
+					kc=true;
+				}
+			}else{
+				kc = true;
+			}
+			if(apj && kc){
+				//完成
+				//已完成
+				//修改提货任务状态
+				DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity();
+				String bill = (String) billLadingId;
+				billLadingEntity.setId(Long.valueOf(bill));
+				billLadingEntity.setConditions("20");
+				baseMapper.updateById(billLadingEntity);
+			}
+
+
+			/*long count = list.stream().filter(e -> e.getConditions().equals("2")).count(); // 订 已签收的数
 			long count2 = list1.stream().filter(e -> e.getConditions().equals("2")).count(); // 库 已签收的数
 			if (Integer.parseInt(String.valueOf(count)) == list.size() && Integer.parseInt(String.valueOf(count2)) == list1.size()) {
 				//修改提货任务状态
@@ -1057,7 +1122,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				billLadingEntity.setId(Long.valueOf(bill));
 				billLadingEntity.setConditions("20");
 				baseMapper.updateById(billLadingEntity);
-			}
+			}*/
 			return  Resp.scanFail( "签收成功","签收成功");
 		}
 	}

From cecf9deca24a5d46aa619cd77e9e5feb546b6ce7 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 8 Sep 2023 11:18:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?1.=E6=AC=A7=E6=B4=BE=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/oupai/receiver/OpReceivingDataHandler.java     | 7 ++-----
 .../oupai/service/impl/OuPaiFactoryServiceImpl.java        | 2 +-
 .../pan/service/impl/PanFactoryDataServiceImpl.java        | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java
index f189d6845..07ba2a9bd 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java
@@ -7,7 +7,6 @@ import com.logpm.factory.pan.service.IPanFactoryDataService;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
-import org.springblade.common.utils.CommonUtil;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -15,8 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-import java.time.LocalTime;
-import java.util.Date;
 import java.util.Map;
 
 
@@ -26,7 +23,7 @@ import java.util.Map;
  * @author yangkai.shen
  */
 @Slf4j
-@RabbitListener(queues = RabbitConstant.RECEIVE_INFO_QUEUE)
+@RabbitListener(queues = RabbitConstant.OUPAI_RECEIVING_QUEUE)
 @Component
 public class OpReceivingDataHandler {
 
@@ -58,7 +55,7 @@ public class OpReceivingDataHandler {
 				log.info("##################opReceivingDataHandler: 处理欧派收货数据到新系统,packageStatus:{},orderPackageCode:{},receivingTime{}",
 						packageStatus,orderPackageCode,receivingTime);
 				//判断是否是已入库
-				if("已入库".equals(packageStatus)){
+				if("已在库".equals(packageStatus)){
 					//真正的处理需要的数据
 					try {
 						panFactoryDataService.handleDataToPlatform(orderPackageCode, receivingTime);
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
index 23223e84f..fc38249af 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
@@ -178,7 +178,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		map.put("createTime", new Date().getTime());
 		try {
 
-			rabbitTemplate.convertAndSend(RabbitConstant.RECEIVE_INFO_EXCHANGE, RabbitConstant.RECEIVE_INFO_ROUTING, map);
+			rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_RECEIVING_EXCHANGE, RabbitConstant.OUPAI_RECEIVING_ROUTING, map);
 		} catch (Exception e) {
 			log.error("############handlePackageData: {}", e.getMessage());
 		}
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
index f90613d77..b595e0aad 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
@@ -572,7 +572,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	 *
 	 * @param unitNo
 	 * @param distributionStockArticleEntity
-	 * @param id
+	 * @param waybillNo
 	 * @param basicdataWarehouseEntity
 	 */
 	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity,  BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo) {

From f668bed73daf4d19af9622a4def2c652e9d00b23 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 8 Sep 2023 14:54:43 +0800
Subject: [PATCH 4/4] =?UTF-8?q?1.=E6=8F=90=E4=BE=9B=E5=AF=B9=E5=A4=96?=
 =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E5=8C=85=E4=BB=B6=EF=BC=8C=E9=9B=B6=E6=8B=85?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=93=E5=AD=98=E5=93=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/IWarehouseUpdownTypeClient.java     | 52 ++++++++++
 .../feign/WarehouseUpdownTypeClient.java      | 99 +++++++++++++++++++
 2 files changed, 151 insertions(+)
 create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java
 create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java

diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java
new file mode 100644
index 000000000..3bfd4e30b
--- /dev/null
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java
@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * 上下架 Feign接口类
+ *
+ * @author zhy
+ * @since 2023-08-15
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME
+)
+public interface IWarehouseUpdownTypeClient {
+
+    String API_PREFIX = "warehouseUpdownTypeLog/client";
+    String TOP = API_PREFIX + "/top";
+
+	@GetMapping(TOP + "/downPackage")
+	R downPackage(@RequestParam("orderPackageCodes") String orderPackageCodes);
+
+	@PostMapping(TOP + "/downZeroOrder")
+	R downZeroOrder(@RequestBody List<JSONObject> zeroOrders);
+
+	@PostMapping(TOP + "/downStock")
+	R downStock(@RequestBody List<JSONObject> stockLists);
+}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java
new file mode 100644
index 000000000..28438889b
--- /dev/null
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java
@@ -0,0 +1,99 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import com.logpm.warehouse.dto.UpShelfPackageDTO;
+import com.logpm.warehouse.dto.UpShelfStockDTO;
+import com.logpm.warehouse.dto.UpShelfZeroOrderDTO;
+import com.logpm.warehouse.service.IWarehouseUpdownTypeService;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 上下架记录表 Feign实现类
+ *
+ * @author lmy
+ * @since 2023-08-15
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient {
+
+    private final IWarehouseUpdownTypeService warehouseUpdownTypeService;
+
+	@Override
+	public R downPackage(String orderPackageCodes) {
+		List<UpShelfPackageDTO> upShelfPackageList = new ArrayList<>();
+		String[] split = orderPackageCodes.split(",");
+		for(String orderPackageCode:split){
+			UpShelfPackageDTO dto = new UpShelfPackageDTO();
+			dto.setOrderPackageCode(orderPackageCode);
+			upShelfPackageList.add(dto);
+		}
+		if(upShelfPackageList.size() > 0){
+			return warehouseUpdownTypeService.downPackage(upShelfPackageList);
+		}else{
+			return R.fail(403,"处理失败");
+		}
+	}
+
+	@Override
+	public R downZeroOrder(List<JSONObject> zeroOrders) {
+		List<UpShelfZeroOrderDTO> ls = new ArrayList<>();
+		for (JSONObject jsonObject:zeroOrders){
+			UpShelfZeroOrderDTO dto = new UpShelfZeroOrderDTO();
+			dto.setOrderCode(jsonObject.getString("orderCode"));//订单号
+			dto.setWaybillCode(jsonObject.getString("waybillCode"));//运单号
+			dto.setEnterNum(jsonObject.getInteger("enterNum"));//件数
+			dto.setAllocationId(jsonObject.getLong("allocationId"));//库位id
+			ls.add(dto);
+		}
+
+		if(ls.size() > 0){
+			return warehouseUpdownTypeService.downZeroOrder(ls);
+		}else{
+			return R.fail(403,"处理失败");
+		}
+	}
+
+	@Override
+	public R downStock(List<JSONObject> stockLists) {
+		List<UpShelfStockDTO> ls = new ArrayList<>();
+		for (JSONObject jsonObject:stockLists){
+			UpShelfStockDTO dto = new UpShelfStockDTO();
+			dto.setMarketId(jsonObject.getLong("marketId"));//商场id
+			dto.setMaterialCode(jsonObject.getString("materialCode"));//物料编码
+			dto.setIncomingBatch(jsonObject.getString("incomingBatch"));//批次号
+			dto.setEnterNum(jsonObject.getInteger("enterNum"));//件数
+			dto.setAllocationId(jsonObject.getLong("allocationId"));//库位id
+			ls.add(dto);
+		}
+
+		if(ls.size() > 0){
+			return warehouseUpdownTypeService.downStock(ls);
+		}else{
+			return R.fail(403,"处理失败");
+		}
+	}
+}