自提任务BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@@ -515,7 +515,7 @@
             resultType="com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO">
         SELECT
         ( SELECT count( 1 ) FROM logpm_distrilbution_bill_stock WHERE bill_lading_id = ldbl.id AND order_status != 2 AND is_deleted = 0) AS orderNum ,
-        IFNULL((SELECT SUM(quantity) FROM logpm_distribution_reservation_zero_package WHERE reservation_id = ldbl.id AND is_deleted = 0),0) + IFNULL((SELECT sum(packet_number) FROM logpm_distrilbution_bill_package WHERE bill_lading_id = ldbl.id AND is_deleted = 0),0) AS planNum,
+        IFNULL((SELECT SUM(quantity) FROM logpm_distribution_reservation_zero_package WHERE reservation_id = ldbl.id AND is_deleted = 0),0) + IFNULL((SELECT sum(packet_number) FROM logpm_distrilbution_bill_package WHERE bill_lading_id = ldbl.id AND is_deleted = 0),0)+(IFNULL((SELECT SUM(quantity) FROM logpm_distribution_delivery_details WHERE bill_lading_id = ldbl.id AND is_deleted = 0),0) AS inventoryNub) AS planNum,
         IFNULL((SELECT SUM(quantity) FROM logpm_distribution_delivery_details WHERE bill_lading_id = ldbl.id AND is_deleted = 0),0) AS inventoryNub,
         IFNULL((SELECT SUM(quantity) FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = ldbl.id AND is_deleted = 0) ,0) AS signedNum
         FROM

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -1280,7 +1280,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				if (!list1.isEmpty()) {
 					//有零担
 					int sum = list1.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
-					planNum = planNum + sum;
+//					planNum = planNum + sum;
 				}
 				QueryWrapper<DistributionBillLadingScanEntity> qw = new QueryWrapper<>();
 				qw.eq("bill_lading_id", vo.getBillLadingId());
@@ -1306,8 +1306,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						.eq(DistrilbutionBillPackageEntity::getStockArticleId, s)
 						.apply("packet_bar_status in (1,3)")
 					);
-					int pn = list.size(); //包件数量
-					planNum = planNum + pn;
+//					int pn = list.size(); //包件数量
+//					planNum = planNum + pn;
 					//通过订单id查询扫描表中有多少数据
 //					QueryWrapper<DistributionBillLadingScanEntity> qw = new QueryWrapper<>();
 //					qw.eq("stock_article_id", Long.parseLong(s))
@@ -1333,10 +1333,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				} else {
 					vo.setInventoryNum(0);
 				}
-				vo.setOrderNum(orderNum); //订单总数
-				vo.setPlanNum(planNum); //自提件数
-				vo.setSignedNum(signedNum); //签收总数
-				vo.setInventoryNub(inventoryNub); //库存品数
+				DistrilbutionAppBillLadingOrderMainVO billLadingOrderMainVO = baseMapper.getBillLadingOrderMainVO(vo.getBillLadingId());
+				vo.setOrderNum(billLadingOrderMainVO.getOrderNum()); //订单总数
+				vo.setPlanNum(billLadingOrderMainVO.getPlanNum()); //自提件数
+				vo.setSignedNum(billLadingOrderMainVO.getSignedNum()); //签收总数
+				vo.setInventoryNub(billLadingOrderMainVO.getInventoryNub()); //库存品数
 			}
 			pageList.setRecords(records);
 
@@ -1829,7 +1830,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			DistrilbutionAppBillLadingOrderMainVO billLadingOrderMainVO = baseMapper.getBillLadingOrderMainVO(Long.parseLong((String) billLadingId));
 			Integer planNum = billLadingOrderMainVO.getPlanNum();
 			Integer signedNum = billLadingOrderMainVO.getSignedNum();
-			if (planNum == signedNum){
+			if ((planNum+billLadingOrderMainVO.getInventoryNub()) == signedNum){
 				return Resp.scanFail("提货任务扫描已完成！", "提货任务扫描已完成！");
 			}
 			if (ObjectUtils.isNotNull(billLadingEntity1) && "30".equals(billLadingEntity1.getConditions())) {