Merge branch 'dev' into pre-production

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 上下架 Feign接口类
@@ -45,8 +46,8 @@ public interface IWarehouseUpdownTypeClient {
 	R downPackage(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId,@RequestParam("remark") String remark);
 
 
-	@GetMapping(TOP + "/downDeliveryPackage")
+	@PostMapping(TOP + "/downDeliveryPackage")
-	R downDeliveryPackage(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId);
+	R downDeliveryPackage(@RequestBody Map<String,Object> map);
 
 	@PostMapping(TOP + "/downZeroOrder")
 	R downZeroOrder(@RequestBody List<JSONObject> zeroOrders);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/OrderPackageStatusDataHandler.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Slf4j
@@ -61,8 +62,11 @@ public class OrderPackageStatusDataHandler {
 
 			DistributionReservationEntity reservationEntity = JSONObject.parseObject(reservationEntityJson,DistributionReservationEntity.class);
 
+			Map<String,Object> downMap = new HashMap<>();
+			downMap.put("orderPackageCode",parcelListEntity.getOrderPackageCode());
+			downMap.put("warehouseId",myCurrentWarehouseId);
 			//包件配送下架
-			warehouseUpdownTypeClient.downDeliveryPackage(parcelListEntity.getOrderPackageCode(), myCurrentWarehouseId);
+			warehouseUpdownTypeClient.downDeliveryPackage(downMap);
 			//维护订单的信息
 			distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(), myCurrentWarehouseId);
 			//维护预约的信息

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

@@ -846,7 +846,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								}
 								if (Func.isNotEmpty(orderPackageCodes)) {
 									String orderPackages = orderPackageCodes.stream().distinct().collect(Collectors.joining(","));
-									warehouseUpdownTypeClient.downDeliveryPackage(orderPackages, myCurrentWarehouse.getId());
+									Map<String,Object> map = new HashMap<>();
+									map.put("orderPackageCode",orderPackages);
+									map.put("warehouseId",myCurrentWarehouse.getId());
+									warehouseUpdownTypeClient.downDeliveryPackage(map);
 								}
 								//维护预约的信息
 								distributionReservationService.maintenanceReservationInfo(distrilbutionloadingscanDTO.getReservationId());
@@ -875,8 +878,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	private void extracteOrderPackageStatus(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO, DistributionParcelListEntity parcelListEntity, BasicdataWarehouseEntity myCurrentWarehouse, DistributionReservationEntity reservationEntity) {
+		Map<String,Object> map = new HashMap<>();
+		map.put("orderPackageCode",parcelListEntity.getOrderPackageCode());
+		map.put("warehouseId",, myCurrentWarehouse.getId());
 		//包件配送下架
-		warehouseUpdownTypeClient.downDeliveryPackage(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
+		warehouseUpdownTypeClient.downDeliveryPackage(map);
 		//维护订单的信息
 		distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(), myCurrentWarehouse.getId());
 		//维护预约的信息
@@ -1834,7 +1840,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (Func.isNotEmpty(updatePackageList)) {
 			String updownrOderPackages = updatePackageList.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(","));
 			if (Func.isNotEmpty(orderPackages)) {
-				warehouseUpdownTypeClient.downDeliveryPackage(updownrOderPackages, myCurrentWarehouse.getId());
+				Map<String,Object> map = new HashMap<>();
+				map.put("orderPackageCode",updownrOderPackages);
+				map.put("warehouseId",myCurrentWarehouse.getId());
+				warehouseUpdownTypeClient.downDeliveryPackage(map);
 			}
 			List<Long> packageIds = updatePackageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
 			if (Func.isNotEmpty(packageIds)) {
@@ -5469,8 +5478,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 			parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue());
 			distributionParcelListService.updateById(parcelListEntity);
+			Map<String,Object> map = new HashMap<>();
+			map.put("orderPackageCode",distrilbutionloadingscanDTO.getBarcode());
+			map.put("warehouseId",myCurrentWarehouse.getId());
 			//出库
-			warehouseUpdownTypeClient.downDeliveryPackage(distrilbutionloadingscanDTO.getBarcode(), myCurrentWarehouse.getId());
+			warehouseUpdownTypeClient.downDeliveryPackage(map);
 			//查询本车次是否第一次扫码,没有则更新上车时间
 			Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 			//更新签收表的装车数量

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

@@ -4513,7 +4513,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					//批量下架
 					String collected = packageCodes.stream().distinct().collect(Collectors.joining(","));
 					log.info(method+"司机批量签收进行包件下架:{}",collected);
-					warehouseUpdownTypeClient.downDeliveryPackage(collected, myCurrentWarehouse.getId());
+					Map<String,Object> map = new HashMap<>();
+					map.put("orderPackageCode",collected);
+					map.put("warehouseId",myCurrentWarehouse.getId());
+
+					warehouseUpdownTypeClient.downDeliveryPackage(map);
 				}
 			}
 

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

@@ -1034,6 +1034,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			List<Long> packageIds = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
 			//将这些包件还原成可操作状态
 			Integer num = distributionParcelListService.restorePakcageByIds(packageIds);
+			log.info("######################取消自提单释放包件>>>>>:{}",num);
+			ids.forEach(id ->{
+				//查询自提单存在的零担订单
+				List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+					.eq(DistributionReservationZeroPackageEntity::getReservationId, id)
+					.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "2")
+				);
+				if (Func.isNotEmpty(reservationZeroPackageEntities)){
+					List<Long> collect = reservationZeroPackageEntities.stream().map(DistributionReservationZeroPackageEntity::getStockArticleId).distinct().collect(Collectors.toList());
+					//释放零担资源
+					distributionZeroPackageService.recoverZeroPackage(id,collect);
+				}
+			});
 			//维护订单状态
 			String orderCodes = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderCode).distinct().collect(Collectors.joining(","));
 			distributionStockArticleService.maintenanceOrderInfo(orderCodes, myCurrentWarehouse.getId());
@@ -1058,7 +1071,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//对所有的库存品相关进行取消标识
 			UpdateWrapper<DistributionDeliveryDetailsEntity> updateWrapper = new UpdateWrapper<>();
 			updateWrapper.lambda()
-				.set(DistributionDeliveryDetailsEntity::getInventoryStatus, 3)
+				.set(DistributionDeliveryDetailsEntity::getInventoryStatus, 2)
 				.set(DistributionDeliveryDetailsEntity::getQuantity, 0)
 				.in(DistributionDeliveryDetailsEntity::getBillLadingId, ids);
 			distributionDeliveryDetailsService.update(updateWrapper);

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -64,7 +65,10 @@ public class DistributionDatarepair {
 			packageMap.forEach((k, v) -> {
 				String orderPackageCodes = v.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(","));
 				stringBuffer.append("仓库:"+k).append("包件下架"+orderPackageCodes);;
-				warehouseUpdownTypeClient.downDeliveryPackage(orderPackageCodes, k);
+				Map<String,Object> map = new HashMap<>();
+				map.put("orderPackageCode",orderPackageCodes);
+				map.put("warehouseId",k);
+				warehouseUpdownTypeClient.downDeliveryPackage(map);
 			});
 		}
 		log.info("执行包件下架操作>>>>>>>>>>>>>"+stringBuffer.toString());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java

@@ -30,6 +30,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 上下架记录表 Feign实现类
@@ -62,8 +63,10 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient {
 	}
 
 	@Override
-	public R downDeliveryPackage(String orderPackageCodes,Long warehouseId) {
+	public R downDeliveryPackage(Map<String,Object> map) {
 		List<UpShelfPackageDTO> upShelfPackageList = new ArrayList<>();
+		String orderPackageCodes = (String) map.get("orderPackageCode");
+		String warehouseId = (String) map.get("warehouseId");
 		String[] split = orderPackageCodes.split(",");
 		for(String orderPackageCode:split){
 			UpShelfPackageDTO dto = new UpShelfPackageDTO();
@@ -71,7 +74,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient {
 			upShelfPackageList.add(dto);
 		}
 		if(upShelfPackageList.size() > 0){
-			return warehouseUpdownTypeService.downDeliveryPackage(upShelfPackageList,warehouseId);
+			return warehouseUpdownTypeService.downDeliveryPackage(upShelfPackageList,Long.parseLong(warehouseId));
 		}else{
 			return R.fail(403,"处理失败");
 		}

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

@@ -210,7 +210,7 @@
                lwug.allocation_title allocationName,
                lwt.pallet_code trayCode,
                lwug.num num,
-               lwug.allocaation_id allocationId,
+               lwug.allocation_id allocationId,
                lwt.id trayId,
                lwug.position_code positionCode
         from logpm_warehouse_updown_goods lwug