Merge remote-tracking branch 'origin/dev' into pre-production

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

@@ -2450,7 +2450,7 @@
         logpm_distribution_reservation_stockarticle AS ldrs
         LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldrs.stock_article_id = ldsa.id
         WHERE
-        ldrs.reservation_id IN ( SELECT reservation_id FROM logpm_distribution_signfor WHERE is_deleted = 0 AND delivery_id = 1829044311027896321 )
+        ldrs.reservation_id IN ( SELECT reservation_id FROM logpm_distribution_signfor WHERE is_deleted = 0 AND delivery_id = #{param.id} )
         AND ldrs.stock_article_status != 2
         AND ldrs.is_deleted = 0
         AND ldrs.is_zero = #{isZero}

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

@@ -6169,7 +6169,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						p.setReservationNum(p.getQuantity());
 						p.setLoadingNub(0);
 						p.setSigningNub(0);
-						DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanMapper.selectOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getPackageId, p.getId()));
+						DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanMapper.selectOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
+							.eq(DistributionLoadscanEntity::getPackageId, p.getId())
+						);
 						if (Func.isNotEmpty(distributionLoadscanEntity)) {
 							//该包件存在扫描记录
 							String scanStatus = distributionLoadscanEntity.getScanStatus();
@@ -6193,20 +6195,22 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 								default:
 									log.info("未知的扫描状态 scanStatus={}", scanStatus);
 							}
-							switch (distributionLoadscanEntity.getSignforType()) {
-								case 1:
-									p.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getName());
-									break;
-								case 2:
-									p.setSignforType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getName());
-									break;
-								case 3:
-									p.setSignforType(LoadScanSigningTypeStatusConstant.wenyuanpiliangqianshou.getName());
-									break;
-								default:
-									log.info("未知的签收方式 scanStatus={}", scanStatus);
-							}
 
+							if (!Objects.isNull(distributionLoadscanEntity.getSignforType())){
+								switch (distributionLoadscanEntity.getSignforType()) {
+									case 1:
+										p.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getName());
+										break;
+									case 2:
+										p.setSignforType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getName());
+										break;
+									case 3:
+										p.setSignforType(LoadScanSigningTypeStatusConstant.wenyuanpiliangqianshou.getName());
+										break;
+									default:
+										log.info("未知的签收方式 scanStatus={}", scanStatus);
+								}
+							}
 							p.setLoadingNub(distributionLoadscanEntity.getLoadedNub());
 							p.setSigningNub(distributionLoadscanEntity.getReceivedQuantity());
 							if (Func.isNotEmpty(distributionLoadscanEntity.getSigningTime())) {