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

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

@@ -3353,7 +3353,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					break;
 				}
 			}
-
+			distributionParcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
+			distributionParcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
+			distributionParcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
+			distributionParcelListService.save(distributionParcelListEntity);
 
 			if (distributionParcelListEntity != null) {
 				n.set(true);
@@ -3440,9 +3443,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 			distributionBillLadingScanService.save(distributionBillLadingScan);
 			//进行下架解托
-			if(StringUtils.isNotBlank(distributionBillLadingScan.getPacketBarCode())){
+//			if(StringUtils.isNotBlank(distributionBillLadingScan.getPacketBarCode())){
-				warehouseUpdownTypeClient.downPackageOrDelTray(distributionBillLadingScan.getPacketBarCode(),myCurrentWarehouse.getId(),"自提下架解托");
+//				warehouseUpdownTypeClient.downPackageOrDelTray(distributionBillLadingScan.getPacketBarCode(),myCurrentWarehouse.getId(),"自提下架解托");
-			}
+//			}
 
 
 

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml

@@ -416,11 +416,11 @@
         ldl.signing_time sjsigning_time,
         ldl.signing_user lds_signee_name,
         case when ldl.signfor_type = 1 THEN
-        '扫描签收'
+        '司机扫描签收'
         when ldl.signfor_type = 2 then
-        '文员签收'
+        '司机批量签收'
         when ldl.signfor_type = 3 then
-        '一键签收'
+        '文员批量签收'
         else
         ''
         end sign_type,