修复一个货位上多个物料批次 备货失败的情况

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupListVO.java

@@ -34,4 +34,9 @@ public class DistributionStockupListVO implements Serializable {
 
 	private Integer realNum;//件数
 
+	/**
+	 * 商城名称
+	 */
+	private String mallName;
+
 }

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/entity/OrderPackageStatusPushFailLogEntity.java

@@ -28,7 +28,7 @@ public class OrderPackageStatusPushFailLogEntity extends BaseEntity {
 	private Integer trayId;
 
 	@ApiModelProperty(value = "包件数据状态1=到货，2=分拣，3=装车，4=卸车，5=出库，6=配送，7=签收,8=滞留,9=备货")
-	private String status;
+	private String orderPackageStatus;
 
 	@ApiModelProperty(value = "数据状态 0 待解析 1 解析成功 2 超过执行查询次数")
 	private Integer dataStatus;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -1156,7 +1156,11 @@ public class DistributionStockupAppController extends BladeController {
 			else {
 				// 2打印处理的扫码
 				// 查询当前库位上最早入库的指定物料库存品
-				byId = disStockOrdercodeRecoService.selectStockOrdercodeRecoListByCode(stockupDTO.getCargoNumber(),stockupDTO.getAllocationId());
+				byId = disStockOrdercodeRecoService.selectStockOrdercodeRecoListByCode(stockupDTO.getCargoNumber(),stockupDTO.getAllocationId(),stockupDTO.getMallName());
+
+				// 需要判断当前这个找到的备货批次和计划的批次是否一直，如果不一致 就需要新增一个预约备货记录 扣减当前的数量
+//				updateStockOrdercodeRecoS(reservationId,byId);
+
 				if (Func.isEmpty(byId)){
 					return Resp.scanFail("当前库位无此物料库存品","当前库位无此物料库存品");
 				}
@@ -1337,11 +1341,14 @@ public class DistributionStockupAppController extends BladeController {
 				return Resp.scanFail("当前货位没有该包件信息！！", "当前货位没有该包件信息！！");
 			}
 		}
-		//校验 修改库存品数据
-		R r1 = distributionStockupService.handlingPackages(stockupDTO);
-		if(r1.getCode() != 200){
-			Resp.scanFail(r1.getMsg(),r1.getMsg());
+		//有数数据校验 修改库存品数据
+		if (byId.getSourceType().equals("1")){
+			R r1 = distributionStockupService.handlingPackages(stockupDTO);
+			if(r1.getCode() != 200){
+				Resp.scanFail(r1.getMsg(),r1.getMsg());
+			}
 		}
+
 		Integer i = distributionStockupService.selectPackagePrint(stockupDTO);
 		switch (i) {
 			case 1:

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java

@@ -71,4 +71,7 @@ public class StockupDTO implements Serializable {
 	private Integer packageNum;//包条数量
 	private String isZero;//零担标识 0否 1是
 
+	// 商场名
+	private String mallName;
+
 }

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

@@ -1337,7 +1337,7 @@
         LEFT JOIN logpm_distribution_reservation_stocklist AS ldrs ON ldr.id = ldrs.reservation_id
         LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldrs.stocklist_id = ldsl.id
         WHERE
-        ldr.id = #{reservationId} AND ldsl.cargo_number = #{cargoNumber}
+        ldr.id = #{reservationId} AND ldsl.cargo_number = #{cargoNumber} AND ldrs.stock_list_status in ('1','3')
     </select>
     <select id="selectStockListByReservationIdAndCargoNumber"
             resultType="com.logpm.distribution.entity.DistributionReservationStocklistEntity">

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

@@ -530,6 +530,7 @@
         select DISTINCT ldr.consignee      customer,
                         lds.stockup_status stockupStatus,
                         lds.type_service   typeService,
+                        ldr.mall_name  mallName,
                         (
                             select COUNT(ldrs.id)
                             from logpm_distribution_reservation dr

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDisStockOrdercodeRecoService.java

@@ -57,6 +57,6 @@ public interface IDisStockOrdercodeRecoService extends BaseService<DisStockOrder
 	 * @param allocationId
 	 * @return
 	 */
-	DistributionStockListEntity selectStockOrdercodeRecoListByCode(String cargoNumber,Long allocationId);
+	DistributionStockListEntity selectStockOrdercodeRecoListByCode(String cargoNumber,Long allocationId,String mallName);
 
 }

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

@@ -77,7 +77,7 @@ public class DisStockOrdercodeRecoServiceImpl extends BaseServiceImpl<DisStockOr
 	}
 
 	@Override
-	public DistributionStockListEntity selectStockOrdercodeRecoListByCode(String cargoNumber,Long allocationId) {
+	public DistributionStockListEntity selectStockOrdercodeRecoListByCode(String cargoNumber,Long allocationId,String mallName) {
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if (Func.isEmpty(myCurrentWarehouse)){
 			return null;
@@ -89,12 +89,15 @@ public class DisStockOrdercodeRecoServiceImpl extends BaseServiceImpl<DisStockOr
 		warehouseUpdownGoodsEntity.setWarehouseId(myCurrentWarehouse.getId());
 		warehouseUpdownGoodsEntity.setAssociationType("4");
 		warehouseUpdownGoodsEntity.setAssociationValue(cargoNumber);
+		warehouseUpdownGoodsEntity.setMarketName(mallName);
 		List<WarehouseUpdownGoodsEntity> locationStockListInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity);
 		if (Func.isNotEmpty(locationStockListInformation)){
 			List<String> IncomingBatchs = locationStockListInformation.stream().map(WarehouseUpdownGoodsEntity::getIncomingBatch).collect(Collectors.toList());
 			List<DistributionStockListEntity> distributionStockListEntity = distributionStockListMapper.selectList(Wrappers.<DistributionStockListEntity>query().lambda()
 				.eq(DistributionStockListEntity::getCargoNumber, cargoNumber)
+					.eq(DistributionStockListEntity::getMarketName,mallName)
 				.in(DistributionStockListEntity::getIncomingBatch, IncomingBatchs)
+
 				.orderByAsc(DistributionStockListEntity::getCreateTime)
 			);
 			if (Func.isNotEmpty(distributionStockListEntity)){

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java

@@ -140,9 +140,8 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 
 //				orderPackageStatusPushFailLogMapper.selectList()
 
-
 				OrderPackageStatusPushFailLogEntity orderPackageStatusPushFailLogEntity=new OrderPackageStatusPushFailLogEntity();
-				orderPackageStatusPushFailLogEntity.setStatus(status);
+				orderPackageStatusPushFailLogEntity.setOrderPackageStatus(status);
 				orderPackageStatusPushFailLogEntity.setUnitNo(unitNo);
 				orderPackageStatusPushFailLogEntity.setWarehouseId(currentWarehouseId);
 				orderPackageStatusPushFailLogEntity.setOperationTime(operationTime);
@@ -151,12 +150,9 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 
 				// 插入之前判断这条数据是否存在系统中
 
-
 				orderPackageStatusPushFailLogMapper.insert(orderPackageStatusPushFailLogEntity);
 
 
-
-
 				// 执行定时任务
 				return;
 			}