From a1c49737f49caa41544d07c1fd4014620dc8e9e0 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 7 Mar 2024 11:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionStockArticleController.java   | 12 ++++++++++
 .../DistributionStockArticleMapper.java       |  7 ++++++
 .../mapper/DistributionStockArticleMapper.xml |  6 +++++
 .../IDistributionStockArticleService.java     |  8 +++++++
 .../DistributionDeliveryListServiceImpl.java  |  4 +++-
 .../DistributionStockArticleServiceImpl.java  | 22 +++++++++++++++++++
 6 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
index 127111516..faaeb3b4b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
@@ -465,6 +465,18 @@ public class DistributionStockArticleController extends BladeController {
 	}
 
 
+	/**
+	 * 导入物料基础信息
+	 */
+	@PostMapping("deliveryInfo")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "导入物料基础信息", notes = "传入excel")
+	public R getdeliveryInfo(Integer type,String Code) {
+
+		return distributionStockArticleService.getdeliveryInfo(type,Code);
+	}
+
+
 
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
index d0ac9abfb..1140d0fd6 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
@@ -170,4 +170,11 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 	 * @return
 	 */
     UpDownStockupAreaVO findUpDownStockupZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId);
+
+	/**
+	 * 查询运单信息
+	 * @param waybillNumber
+	 * @return
+	 */
+    List<Long> getOrderListByWaybill(@Param("waybillNumber") String waybillNumber);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 939d577d6..88cce85e5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -1052,5 +1052,11 @@
         WHERE
         ldsa.order_code = #{orderCode} AND ldsa.warehouse_id = #{warehouseId}
     </select>
+    <select id="getOrderListByWaybill"
+            resultType="java.lang.Long">
+        SELECT id FROM logpm_distribution_stock_article WHERE LOCATE(#{waybillNumber},waybill_number) > 0
+        AND waybill_number is not null
+        AND waybill_number != ''
+    </select>
 
 </mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
index 13a32671e..8fe7de884 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
@@ -219,4 +219,12 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 	 * @return
 	 */
     R getOrderDeliveryInfo(Integer type, String code);
+
+	/**
+	 * 查订单配送信息
+	 * @param type
+	 * @param code
+	 * @return
+	 */
+    R getdeliveryInfo(Integer type, String code);
 }
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 b9b45cfdb..db6e83031 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
@@ -6832,7 +6832,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		log.info(">>>>>>>>>>>>>>> 车次状态维护2 代码执行 deliveryLoadingNum={}",deliveryLoadingNum);
 
 		int loadingNum = 0;
-		int signingNum = 0;
 		int deliveryQuantity = deliveryListEntity.getDeliveryNumber() + (Objects.isNull(deliveryListEntity.getInventoryNub()) ? 0 : deliveryListEntity.getInventoryNub());
 		if (Func.isNotEmpty(deliveryLoadingNum)) {
 			loadingNum += deliveryLoadingNum.getInventoryLoadingQuantity() + deliveryLoadingNum.getPackageLoadingQuantity();
@@ -6847,6 +6846,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			if (loadingNum == 0) {
 				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.weizhuangche.getValue());
 			}
+
 		} else {
 			log.error(method + "查询配送无计划数量，deliveryId:{}", deliveryId);
 		}
@@ -6860,6 +6860,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//查看所有的签收信息是否均已完成
 			boolean anyMatch = list.stream().allMatch(s -> s.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue()));
 			log.info(">>>>>>>>>>>>>>> 车次状态维护4 代码执行 anyMatch={}",anyMatch);
+			log.info(">>>>>>>>>>>>>>> 当前车次复核数量:{}",			list.stream().filter(s -> s.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue())).count()
+);
 			if (anyMatch) {
 				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
 			}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index 17ed76bc1..90fa29ae8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -1627,6 +1627,28 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		return null;
 	}
 
+	/**
+	 * @param type
+	 * @param code
+	 * @return
+	 */
+	@Override
+	public R getdeliveryInfo(Integer type, String code) {
+		switch (type){
+			//运单
+			case 1:
+				List<Long> listByWaybillNumber = baseMapper.getOrderListByWaybill(code);
+				
+				break;
+			case 2:
+			//订单
+				break;
+			default:
+				return R.fail("查无此信息");
+		}
+		return null;
+	}
+
 
 	@Override
 	public DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {