开启一键装车、运单审核限制、批量签收推送BUG修复

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

@@ -762,7 +762,6 @@
         LEFT JOIN logpm_warehouse_waybill AS lww ON lww.waybill_no = ltwo.waybill_no
         <where>
             ldsa.order_status in ('10','20','30','70')
-                AND lww.check_status = 1
             and ldsa.reservation_status in ('10','20')
             AND EXISTS (
             SELECT 1

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

@@ -1620,16 +1620,22 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	@Override
 	@Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
 	public R oneloading(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
-		boolean falg = true;
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if (Objects.isNull(myCurrentWarehouse)) {
 
 			return R.fail(403, "请选择仓库!!");
 //			throw n/**/ew CustomerException(403, "仓库信息不能为空");
 		}
-		if (falg) {
-			return Resp.scanFail("功能维护中...", "功能维护中...");
+		Integer isStrictLoading = 0;
+		WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
+		if (!Objects.isNull(warehouseConfig)){
+			//开启强制装车无法使用此功能
+			isStrictLoading = warehouseConfig.getIsStrictLoading() != null?warehouseConfig.getIsStrictLoading():0;
 		}
+		if (Objects.equals(isStrictLoading,1)){
+			return Resp.scanFail("请扫描装车","请扫描装车");
+		}
+
 		/*
 		1. 通过查询这个所有的预约单
 		2.通过预约单ID 得到所有的订单

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

@@ -5385,8 +5385,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (Objects.isNull(myCurrentWarehouse)) {
 			return R.fail(403, "仓库信息不能为空");
 		}
-		WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
 		Integer isStrictLoading = 0;
+		WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
+		if (!Objects.isNull(warehouseConfig)){
+			//开启强制装车无法使用此功能
+			isStrictLoading = warehouseConfig.getIsStrictLoading() != null?warehouseConfig.getIsStrictLoading():0;
+		}
 		List<DistributionLoadscanAbnormalEntity> abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
 			.eq(DistributionLoadscanAbnormalEntity::getReservationId, distributionSignfor.getReservationId())
 			.ne(DistributionLoadscanAbnormalEntity::getComplete, Integer.parseInt(IsOrNoConstant.yes.getValue()))
@@ -5492,6 +5496,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				builder.append(distributionSignforEntity.getDriverRemarks()).append(deliverySelfEntity.getDriverName() + ":" + distributionSignfor.getDriverRemarks());
 				distributionSignforEntity.setDriverRemarks(builder.toString());
 			}
+			if (!aaa.isEmpty()){
+				trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
+			}
 		} else {
 			if (deliverySelfEntity.getIsMaster().equals(1)) {
 				return Resp.scanFail("操作失败", "当前操作由主司机操作");
@@ -5822,6 +5829,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscanEntity.setOneClick(2);
 						loadscanEntity.setOneQclick(2);
 						loadscanEntity.setSigningTime(signingTime);
+						loadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
+						loadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
 						if (distributionSignfor.getIsClerk()) {
 							loadscanEntity.setMsg("文员一键签收数据补录");
 						} else {