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

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaEntity.java

@@ -61,8 +61,8 @@ public class WarehouseUpdownStockupAreaEntity extends TenantEntity {
 	/** 关联值 */
 	@ApiModelProperty(name = "关联值",notes = "")
 	private String associationValue ;
-	/** 关联类型;1.订单号  2运单号 3包件码 */
-	@ApiModelProperty(name = "关联类型",notes = "1.订单号  2运单号 3包件码 4库存品")
+	/** 1.包件  2库存品 3订单 4托盘 */
+	@ApiModelProperty(name = "关联类型",notes = "1.包件  2库存品 3订单 4托盘")
 	private String associationType ;
 	/** 货物名称 */
 	@ApiModelProperty(name = "货物名称",notes = "")

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

@@ -46,4 +46,16 @@ public interface IWarehouseUpdownStockUpAreaClient {
 
 	@GetMapping(TOP+"/upStockUpShelf")
 	Boolean upStockUpShelf(@RequestParam String code,@RequestParam Long stockUpAllocationId,@RequestParam Long warehouseId,@RequestParam Integer type,@RequestParam Integer num);
+
+
+	/**
+	 * 备货库位下架接口
+	 * @param code
+	 * @param warehouseId
+	 * @param type
+	 * @param num
+	 * @return
+	 */
+	@GetMapping(TOP+"/downStockUpShelf")
+	Boolean downStockUpShelf(@RequestParam String code,@RequestParam Long warehouseId,@RequestParam Integer type,@RequestParam Integer num);
 }

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

@@ -2816,6 +2816,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			if (parcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
 				return Resp.scanFail("操作失败", "该包件已签收");
 			}
+
 			//确认该包件确实不属于该配送任务
 			List<DistributionParcelListEntity> parcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
 			boolean flag = parcelListEntities.stream().anyMatch(p -> p.getOrderPackageStatus().equals(distrilbutionloadingscanDTO.getBarcode()));
@@ -2840,11 +2841,24 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			//查询装车扫描表
-			DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
+			List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 				.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
-				.eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
+//				.eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
 				.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
+
+			DistributionLoadscanEntity loadscanEntity = null;
+			if (loadscanEntityList.isEmpty()){
+				if (loadscanEntityList.size() > 1){
+					log.error("##############异常签收包件在其他车次进行装车reservationId:{}", loadscanEntityList.stream().map(DistributionLoadscanEntity::getReservationId).map(String::valueOf).collect(Collectors.joining(",")));
+					return Resp.scanFail("操作失败", "包件已出库");
+				}
+
+				if (loadscanEntityList.size() == 1){
+					 loadscanEntity = loadscanEntityList.get(0);
+				}
+			}
+
 			if (Func.isNotEmpty(loadscanEntity)) {
 				if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
 					return Resp.scanFail("重复操作!!", "重复操作");

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

@@ -2720,7 +2720,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			handQuantity = handQuantity - sum;
 			for (WarehouseUpdownGoodsEntity updownGoodsEntity : locationStockListInformation) {
 				Map<String,Object> map = new HashMap<>();
-				map.put("allocation",updownGoodsEntity.getPositionCode());
+				map.put("allocationName",updownGoodsEntity.getPositionCode());
+				map.put("allocationid",updownGoodsEntity.getAllocationId());
 				map.put("num",updownGoodsEntity.getNum());
 				allocationMapList.add(map);
 			}
@@ -2744,6 +2745,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					BasicdataTrayEntity trayByTrayCode = basicdataTrayClient.getTrayByTrayCode(next.getTrayCode());
 					Map<String,Object> map = new HashMap<>();
 					map.put("trayCode",next.getTrayCode());
+					map.put("trayId",next.getTrayId());
 					map.put("trayName",trayByTrayCode.getPalletName());
 					map.put("num",next.getNum());
 					trayMapList.add(map);

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

@@ -36,6 +36,7 @@ import com.logpm.distribution.vo.*;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.DictBizCache;
@@ -47,6 +48,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 提货单订单信息关联 服务实现类
@@ -110,7 +112,6 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 					i.setStockupCreateUser(userR.getData().getRealName());
 				}
 			}
-
 		});
 		return billOrderPack;
 	}

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

@@ -40,4 +40,17 @@ public class WarehouseUpdownStockupAreaClient implements IWarehouseUpdownStockUp
 		return warehouseUpdownStockupAreaService.upStockUpShelf(code,stockUpAllocationId,warehouseId,type,num);
 	}
 
+	/**
+	 * @param code
+	 * @param warehouseId
+	 * @param type
+	 * @param num
+	 * @return
+	 */
+	@Override
+	public Boolean downStockUpShelf(String code, Long warehouseId, Integer type, Integer num) {
+
+		return warehouseUpdownStockupAreaService.downStockUpShelf(code,warehouseId,type,num);
+	}
+
 }

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

@@ -56,4 +56,14 @@ public interface IWarehouseUpdownStockupAreaService extends BaseService<Warehous
 	Boolean upStockUpShelf(String code, Long stockUpAllocationId, Long warehouseId, Integer type,Integer num);
 
     BasicdataGoodsAllocationEntity upShelfScanAllocation(Long allocationId, Long warehouseId);
+
+	/**
+	 * 备货库位下架
+	 * @param code
+	 * @param warehouseId
+	 * @param type
+	 * @param num
+	 * @return
+	 */
+    Boolean downStockUpShelf(String code, Long warehouseId, Integer type, Integer num);
 }

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

@@ -230,4 +230,59 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 		BasicdataGoodsAllocationEntity stockUpAllocationById = basicdataGoodsAllocationClient.findStockUpAllocationById(warehouseId, allocationId);
 		return stockUpAllocationById;
 	}
+
+	/**
+	 * @param code
+	 * @param warehouseId
+	 * @param type
+	 * @param num
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public Boolean downStockUpShelf(String code, Long warehouseId, Integer type, Integer num) {
+		String method = "######################WarehouseUpdownStockupAreaServiceImpl.upStockUpShelf";
+
+		//查询上架货物
+		List<WarehouseUpdownStockupAreaEntity> warehouseUpdownStockupAreaEntityList = this.list(Wrappers.<WarehouseUpdownStockupAreaEntity>query().lambda()
+			.eq(WarehouseUpdownStockupAreaEntity::getAssociationValue, code)
+			.eq(WarehouseUpdownStockupAreaEntity::getWarehouseId, warehouseId)
+		);
+		if (warehouseUpdownStockupAreaEntityList.isEmpty()){
+			log.error(method+"无上架记录AssociationValue:{},warehouseId:{}",code,warehouseId);
+			return false;
+		}
+		if (warehouseUpdownStockupAreaEntityList.size() > 1){
+			log.error(method+"多条上架记录AssociationValue:{},warehouseId:{}",code,warehouseId);
+			return false;
+		}
+		WarehouseUpdownStockupAreaEntity warehouseUpdownStockupArea = warehouseUpdownStockupAreaEntityList.get(0);
+		switch (warehouseUpdownStockupArea.getAssociationType()){
+			case "1" :
+            case "2" :
+            case "4" :
+                //库存品包件
+                //订制品
+				this.removeById(warehouseUpdownStockupArea.getId());
+				break;
+            case "3":
+				//零担
+				int i = warehouseUpdownStockupArea.getNum() - num;
+				warehouseUpdownStockupArea.setNum(i);
+				if (i == 0){
+					this.removeById(warehouseUpdownStockupArea.getId());
+				}else {
+					this.updateById(warehouseUpdownStockupArea);
+				}
+				break;
+			default:
+				log.error(method+"type错误type:{}",type);
+				return false;
+		}
+		WarehouseUpdownStockupAreaLogEntity warehouseUpdownStockupAreaLogEntity = Func.copy(warehouseUpdownStockupArea, WarehouseUpdownStockupAreaLogEntity.class);
+		warehouseUpdownStockupAreaLogEntity.setNum(num);
+		warehouseUpdownStockupAreaLogEntity.setBindingType(2);
+		warehouseUpdownStockupAreaLogService.save(warehouseUpdownStockupAreaLogEntity);
+		return true;
+	}
 }