修改签收装车

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

@@ -691,11 +691,8 @@
         SELECT distinct
         ldsa.order_code AS orderCode,
         ldrs.reservation_num AS reservationNum,
-        (SELECT COALESCE(COUNT(*), 0)
-        FROM logpm_distribution_loadscan ldl
-        WHERE ldl.order_id = ldsa.id
-        AND ldl.scan_status != 1
-        AND ldl.signfor_state = 2) AS signforNub
+        (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 AND ldl.signfor_state = 2) AS signforNub,
+        (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 AND ldl.signfor_state = 1) AS loadingNub
         FROM
         logpm_distribution_reservation ldr
         JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id
@@ -731,7 +728,8 @@
         FROM logpm_distribution_loadscan ldl
         WHERE ldl.order_id = ldsa.id
         AND ldl.scan_status != 1
-        AND ldl.signfor_state = 2) AS signforNub
+        AND ldl.signfor_state = 2) AS signforNub,
+        (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 AND ldl.signfor_state = 1) AS loadingNub
         FROM
         logpm_distribution_reservation ldr
         JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id
@@ -761,7 +759,8 @@
         FROM logpm_distribution_loadscan ldl
         WHERE ldl.order_id = ldsa.id
         AND ldl.scan_status != 1
-        AND ldl.signfor_state = 2) AS signforNub
+        AND ldl.signfor_state = 2) AS signforNub,
+        (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 AND ldl.signfor_state = 1) AS loadingNub
         FROM
         logpm_distribution_reservation ldr
         JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id

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

@@ -342,6 +342,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public IPage<DistributionAppStockArticleVO> getAppDeliveryorderListPage(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionDeliveryList) {
 		List<DistributionAppStockArticleVO> selectord = baseMapper.selectord(page, distributionDeliveryList);
+		//1-未扫,2-部分扫,3-齐套
 		if (null !=distributionDeliveryList.getCompletecode()){
 			if (distributionDeliveryList.getCompletecode() ==2){
 				selectord	= baseMapper.selectorda(page, distributionDeliveryList);