装车下架调整

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

@@ -44,6 +44,10 @@ public interface IWarehouseUpdownTypeClient {
 	@GetMapping(TOP + "/downPackage")
 	R downPackage(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId);
 
+
+	@GetMapping(TOP + "/downDeliveryPackage")
+	R downDeliveryPackage(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId);
+
 	@PostMapping(TOP + "/downZeroOrder")
 	R downZeroOrder(@RequestBody List<JSONObject> zeroOrders);
 

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

@@ -129,7 +129,7 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     void updateOrderPackageCodeById(@Param("packageId") Long packageId, @Param("orderPackageStatus") String orderPackageStatus);
 
 	/**
-	 * 批量修改包件装车状态
+	 * 批量修改包件装车状态、下架状态
 	 * @param packageIds
 	 * @return
 	 */

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

@@ -1016,7 +1016,7 @@
         where id = #{packageId}
     </update>
     <update id="updatePackageListByIds">
-        UPDATE logpm_distribution_parcel_list SET order_package_loading_status = 20 WHERE id IN
+        UPDATE logpm_distribution_parcel_list SET order_package_loading_status = 20,order_package_status = 60 , order_package_grounding_status = 10 WHERE id IN
         <foreach collection="packageIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>

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

@@ -68,10 +68,7 @@ import org.springblade.common.constant.loading.LoadingIsInsertConstant;
 import org.springblade.common.constant.loading.LoadingStatusConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springblade.common.constant.order.OrderStatusConstant;
-import org.springblade.common.constant.orderpackage.OrderPackageFreezeStatusConstant;
-import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusConstant;
-import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
-import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
+import org.springblade.common.constant.orderpackage.*;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.constant.reservation.*;
 import org.springblade.common.constant.signing.SignforStatusConstant;
@@ -639,19 +636,21 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionLoadscanService.save(loadscanEntity);
 				//更新包件装车状态
 				parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
+				parcelListEntity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue());
+				parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue());
 				distributionParcelListService.updateById(parcelListEntity);
 				//更新装车时间
 				Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 				//更新签收表的装车数量
 				Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
+				//包件配送下架
+				warehouseUpdownTypeClient.downDeliveryPackage(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId());
 				//维护订单的信息
 				distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(),myCurrentWarehouse.getId());
 				//维护预约的信息
 				distributionReservationService.maintenanceReservationInfo(reservationEntity.getId());
 				//维护配送任务信息
 				distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
-				//包件下架
-				warehouseUpdownTypeClient.downPackage(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId());
 			} else if (parcelListEntityList.size() == 0) {
 				//查找出该包件信息
 				DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()));
@@ -809,7 +808,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								}
 								if (Func.isNotEmpty(orderPackageCodes)){
 									String orderPackages = orderPackageCodes.stream().distinct().collect(Collectors.joining(","));
-									warehouseUpdownTypeClient.downPackage(orderPackages,myCurrentWarehouse.getId());
+									warehouseUpdownTypeClient.downDeliveryPackage(orderPackages,myCurrentWarehouse.getId());
 								}
 								//维护预约的信息
 								distributionReservationService.maintenanceReservationInfo(distrilbutionloadingscanDTO.getReservationId());
@@ -1781,7 +1780,7 @@ 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.downPackage(updownrOderPackages,myCurrentWarehouse.getId());
+				warehouseUpdownTypeClient.downDeliveryPackage(updownrOderPackages,myCurrentWarehouse.getId());
 			}
 			List<Long> packageIds = updatePackageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
 			if (Func.isNotEmpty(packageIds)){

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

@@ -61,6 +61,22 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient {
 		}
 	}
 
+	@Override
+	public R downDeliveryPackage(String orderPackageCodes,Long warehouseId) {
+		List<UpShelfPackageDTO> upShelfPackageList = new ArrayList<>();
+		String[] split = orderPackageCodes.split(",");
+		for(String orderPackageCode:split){
+			UpShelfPackageDTO dto = new UpShelfPackageDTO();
+			dto.setOrderPackageCode(orderPackageCode);
+			upShelfPackageList.add(dto);
+		}
+		if(upShelfPackageList.size() > 0){
+			return warehouseUpdownTypeService.downDeliveryPackage(upShelfPackageList,warehouseId);
+		}else{
+			return R.fail(403,"处理失败");
+		}
+	}
+
 
 	@Override
 	public R downPackageOrDelTray(String orderPackageCodes,Long warehouseId) {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java

@@ -76,4 +76,12 @@ public interface IWarehouseUpdownTypeService extends BaseService<WarehouseUpdown
     List<JSONObject> findZeroAllocation(String orderCode, Long warehouseId);
 
 	R findAllAllocationId(Long warehouseId);
+
+	/**
+	 * 配送下架
+	 * @param upShelfPackageList
+	 * @param warehouseId
+	 * @return
+	 */
+	R downDeliveryPackage(List<UpShelfPackageDTO> upShelfPackageList, Long warehouseId);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -1239,6 +1239,56 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		return Resp.scanSuccess("下架成功","成功下架"+num+"件");
 	}
 
+	@Override
+	public R downDeliveryPackage(List<UpShelfPackageDTO> upShelfPackageList,Long warehouseId) {
+		int num = 0;
+		for (UpShelfPackageDTO upShelfPackageDTO:upShelfPackageList){
+			String orderPackageCode = upShelfPackageDTO.getOrderPackageCode();
+			//查询包件在哪个库位上
+			QueryWrapper<WarehouseUpdownGoodsEntity> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("association_type","3")
+				.eq("warehouse_id",warehouseId)
+				.eq("association_value",orderPackageCode);
+			WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper);
+			if(Objects.isNull(updownGoodsEntity)){
+				log.warn("##############downPackage: 包件没有上架记录 orderPackageCode={}",orderPackageCode);
+				continue;
+			}
+			Long allocationId = updownGoodsEntity.getAllocationId();
+			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
+			Integer quantity = parcelListEntity.getQuantity();
+			Long updownGoodsId = updownGoodsEntity.getId();
+			Long updownTypeId = updownGoodsEntity.getUpdownTypeId();
+			WarehouseUpdownTypeEntity updownTypeEntity = baseMapper.selectById(updownTypeId);
+			QueryWrapper<WarehouseTaryAllocationEntity> taryAllocationEntityQueryWrapper = new QueryWrapper<>();
+			taryAllocationEntityQueryWrapper.eq("allocation_id",allocationId)
+				.eq("is_deleted",0);
+			WarehouseTaryAllocationEntity taryAllocationEntity = warehouseTaryAllocationService.getOne(taryAllocationEntityQueryWrapper);
+//			BasicdataTrayEntity trayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId);
+			if(!Objects.isNull(taryAllocationEntity)){
+				//有托盘，托盘下托
+				warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件下架:同步下托",warehouseId);
+			}
+			Integer residue = warehouseUpdownGoodsService.deleteByUpdownGoodsId(updownGoodsId);
+			if(residue == 0){
+				//删除上架方式
+				removeById(updownTypeId);
+				//修改库位状态为空闲
+				basicdataGoodsAllocationClient.updateAllocationStatus(allocationId,"1");
+				//如果有托盘还要删除托盘与库位的绑定
+				if(!Objects.isNull(taryAllocationEntity)){
+					warehouseTaryAllocationService.deleteById(taryAllocationEntity);
+				}
+			}
+			warehouseUpdownGoodsLogService.saveAllocationAndPackage(updownTypeEntity,parcelListEntity,"2",0,"包件下架:包件下架");
+			updateUpdownTypeNum(updownTypeEntity);
+
+			num = num + quantity;
+			warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
+		}
+		return Resp.scanSuccess("下架成功","成功下架"+num+"件");
+	}
+
 
 	@Override
 	public R downPackageOrDelTray(List<UpShelfPackageDTO> upShelfPackageList,Long warehouseId) {