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

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java

@@ -54,4 +54,6 @@ public class WarehouseWaybillVO extends WarehouseWaybillEntity {
 	private BigDecimal totalFee;
 	private String chargeTypes;
 
+	private Integer zeroEditStatus;
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -2628,6 +2628,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			return R.fail(405, "运单信息不存在");
 		}
 
+		String waybillNo = waybillEntity.getWaybillNo();
+
 		if (isEdit.equals(1)) {
 			Integer abolishStatus = waybillEntity.getAbolishStatus();
 			if (abolishStatus.equals(1)) {
@@ -2645,7 +2647,37 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		Map<String, Object> map = new HashMap<>();
 
+
+		Integer zeroEditStatus = 1;
+
+		Integer waybillType = waybillEntity.getWaybillType();
+		Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
+		Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
+		if (waybillType.equals(2)) {
+			//零担改单限制
+
+			Integer totalCount = waybillEntity.getTotalCount();
+			DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId);
+			if (Objects.isNull(endStockArticleEntity)) {
+				DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId);
+				if (Objects.isNull(startStockArticleEntity)) {
+					zeroEditStatus = 1;
+				}
+				Integer handQuantity = startStockArticleEntity.getHandQuantity();
+				if (!NumberUtil.equals(handQuantity, totalCount)) {
+					zeroEditStatus = 0;
+				}
+			}else{
+				Integer incomingQuantity = endStockArticleEntity.getIncomingNum();
+				if(!NumberUtil.equals(incomingQuantity,totalCount)){
+					zeroEditStatus = 0;
+				}
+			}
+		}
+		warehouseWaybillVO.setZeroEditStatus(zeroEditStatus);
+
 		map.put("warehouseWaybill", warehouseWaybillVO);
+		map.put("zeroEditStatus", zeroEditStatus);
 		map.put("payTypeList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_TYPE));
 		map.put("payWayList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_WAY));
 		map.put("deliveryWayList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_DELIVERY_WAY));
@@ -2687,33 +2719,35 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		}
 
 		Integer waybillType = waybillEntity.getWaybillType();
-		if (waybillType.equals(2)) {
-			//零担改单限制
-			Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
-			Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
-			Integer totalCount = waybillEntity.getTotalCount();
-			DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId);
-			if (Objects.isNull(endStockArticleEntity)) {
-				DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId);
-				if (Objects.isNull(startStockArticleEntity)) {
-					log.warn("#############updateWaybill: 订单信息不存在！ waybillId={}", waybillId);
-					return R.fail(405, "订单信息不存在！");
-				}
-				Integer handQuantity = startStockArticleEntity.getHandQuantity();
-				if (!NumberUtil.equals(handQuantity, totalCount)) {
-					log.warn("#############updateWaybill: 始发仓数据已发运 waybillId={}", waybillId);
-					return R.fail(405, "始发仓数据已发运");
-				}
-			}else{
-				Integer incomingQuantity = endStockArticleEntity.getIncomingNum();
-				if(!NumberUtil.equals(incomingQuantity,totalCount)){
-					log.warn("#############updateWaybill: 目的仓数据还未完全到达 waybillId={}", waybillId);
-					return R.fail(405, "目的仓数据还未完全到达");
+		Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
+		Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
+		if(warehouseId.equals(departureWarehouseId) || warehouseId.equals(destinationWarehouseId)){
+			if (waybillType.equals(2)) {
+				//零担改单限制
+
+				Integer totalCount = waybillEntity.getTotalCount();
+				DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId);
+				if (Objects.isNull(endStockArticleEntity)) {
+					DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId);
+					if (Objects.isNull(startStockArticleEntity)) {
+						log.warn("#############updateWaybill: 订单信息不存在！ waybillId={}", waybillId);
+						return R.fail(405, "订单信息不存在！");
+					}
+					Integer handQuantity = startStockArticleEntity.getHandQuantity();
+					if (!NumberUtil.equals(handQuantity, totalCount)) {
+						log.warn("#############updateWaybill: 始发仓数据已发运 waybillId={}", waybillId);
+						return R.fail(405, "始发仓数据已发运");
+					}
+				}else{
+					Integer incomingQuantity = endStockArticleEntity.getIncomingNum();
+					if(!NumberUtil.equals(incomingQuantity,totalCount)){
+						log.warn("#############updateWaybill: 目的仓数据还未完全到达 waybillId={}", waybillId);
+						return R.fail(405, "目的仓数据还未完全到达");
+					}
 				}
 			}
 		}
 
-
 //		//验证运单是否有配送任务
 //		//查询运单下所有订单号
 //		List<String> orderCodes = distributionParcelListClient.findOrderCodeByWaybillId(waybillId);
@@ -2747,8 +2781,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		String consigneeName = waybillEntity.getConsigneeName();
 		String consigneeAddress = waybillEntity.getConsigneeAddress();
 		String consigneeMobile = waybillEntity.getConsigneeMobile();
-		Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
-		Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
 		String departureWarehouseName = waybillEntity.getDepartureWarehouseName();
 		String destinationWarehouseName = waybillEntity.getDestinationWarehouseName();
 		Integer totalCount = waybillEntity.getTotalCount();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -1668,7 +1668,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String orderCode = carsOrderEntity.getOrderCode();
 			String waybillNo = carsOrderEntity.getWaybillNo();
 			Integer carsOrderRealLoadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getWarehouseId()) && NumberUtil.equals(nodeId,scan.getWarehouseId()) && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum();
-			Integer carsOrderRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && !Objects.isNull(scan.getUnloadNodeId()) && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
+			Integer carsOrderRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
 			Integer carsOrderRealSignNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && scan.getScanStatus().equals("3") && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
 			carsOrderEntity.setRealNum(carsOrderRealLoadingNum);
 			carsOrderEntity.setUnloadNum(carsOrderRealUnloadingNum);
@@ -4933,7 +4933,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		noWaybillNoTrunklineCarsLoadScanMapByOrderCode.keySet().forEach(orderCode -> {
 			List<TrunklineCarsLoadScanVO> trunklineCarsLoadScanVOS = noWaybillNoTrunklineCarsLoadScanMapByOrderCode.get(orderCode);
 			//把trunklineCarsLoadScanVOS中所有元素的num加起来，如果num为空则用0代替
-			Integer loadingNum = trunklineCarsLoadScanVOS.stream().map(TrunklineCarsLoadScanVO::getNum).reduce(0, Integer::sum);
+			Integer loadingNum = trunklineCarsLoadScanVOS.stream().filter(t-> Objects.isNull(t.getWarehouseId())).map(TrunklineCarsLoadScanVO::getNum).reduce(0, Integer::sum);
 			Integer unloadNum = trunklineCarsLoadScanVOS.stream().map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum);
 			Integer signNum = trunklineCarsLoadScanVOS.stream().filter(t-> t.getScanStatus().equals("3")).map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum);
 
@@ -7542,6 +7542,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			return R.fail(405, "配载计划不存在");
 		}
 
+
+		TrunklineCarsLoadScanEntity signCarsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCodeAndScanStatus(loadId, orderPackageCode,"3");
+		if(!Objects.isNull(signCarsLoadScanEntity)){
+			log.warn("##############signScanPackageCode: 包件已签收 loadId={} orderPackageCode={}", loadId,orderPackageCode);
+			return R.fail(405, "包件已签收");
+		}
+
+
+		DistributionParcelListEntity orderPackageEntity = distributionParcelListClient.findOrderPackageCodeAndStatus(orderPackageCode, "70");
+		if(!Objects.isNull(orderPackageEntity)){
+			log.warn("##############signScanPackageCode: 包件已签收 loadId={} orderPackageCode={}", loadId,orderPackageCode);
+			return R.fail(405, "包件已签收");
+		}
+
 		String carsNo = carsLoadEntity.getCarsNo();
 
 		Long waybillId = null;

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@@ -1200,7 +1200,11 @@
                 IFNULL(lww.cost_num,0) costNum
         from logpm_warehouse_waybill lww
         left join logpm_warehouse_waybill_detail lwwd on lwwd.waybill_id = lww.id
-        where lww.waybill_no in
+        where lww.abolish_status = 0
+        and lww.freeze_status = 0
+        and lww.is_deleted = 0
+        and lwwd.is_deleted = 0
+        and lww.waybill_no in
         <foreach collection="waybillNos" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>