自提备货库位零担上架

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

@@ -1468,7 +1468,7 @@ public class DistributionStockupAppController extends BladeController {
 						jsonObject.put("type", 2);
 						jsonObject.put("num", 1);
 						//TODO
-//						warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+						warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
 						//扫码成功
 						return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue);
 					case 2:
@@ -1534,7 +1534,7 @@ public class DistributionStockupAppController extends BladeController {
 		String packetBarCode = stockupDTO.getPacketBarCode();//包件码
 		Long stockupId = stockupDTO.getStockupId();//备货任务ID
 		Long reservationId = stockupDTO.getReservationId();//预约单id
-//		Long stockUpAllocationId = stockupDTO.getStockupAllocationId();//备货库位ID
+		Long stockUpAllocationId = stockupDTO.getStockupAllocationId();//备货库位ID
 		if (Objects.isNull(myCurrentWarehouse)) {
 			log.warn("##################stockupScan: 未选择仓库，订单自编号为空");
 			return R.fail(403,"未授权!!");
@@ -1555,10 +1555,10 @@ public class DistributionStockupAppController extends BladeController {
 			log.warn("##################stockupScan: 包件扫码，预约单id为空");
 			return R.fail("包件扫码:预约单id不能为空");
 		}
-//		if (Objects.isNull(stockUpAllocationId)) {
-//			log.warn("##################stockupScan: 备货库位不存在，stockUpAllocationId:{}",stockUpAllocationId);
-//			return Resp.scanFail("请扫描备货库位","请扫描备货库位");
-//		}
+		if (Objects.isNull(stockUpAllocationId)) {
+			log.warn("##################stockupScan: 备货库位不存在，stockUpAllocationId:{}",stockUpAllocationId);
+			return Resp.scanFail("请扫描备货库位","请扫描备货库位");
+		}
 
 		Integer integer = distributionStockupService.selectPackage(stockupDTO);
 		switch (integer) {
@@ -1662,7 +1662,7 @@ public class DistributionStockupAppController extends BladeController {
 					jsonObject.put("num", 1);
 					//进行了备货库位的选择才进行备货库位的上架
 					//TODO
-//					warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+					warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
 					//修改包件备货状态
 				DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
 				parcelListEntity.setId(entity.getParcelListId());

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

@@ -13,8 +13,8 @@ public class StockupDTO implements Serializable {
 	private String stockupDateEnd;//备货日期
 
 	private Integer status;//0未完成  1已完成
-//	private Long stockupAllocationId;//0未完成  1已完成
-//	private String stockupAllocationName;//0未完成  1已完成
+	private Long stockupAllocationId;//0未完成  1已完成
+	private String stockupAllocationName;//0未完成  1已完成
 
 	/**
 	 * 客户名城

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

@@ -2004,7 +2004,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				jsonObject.put("type", 4);
 				jsonObject.put("num", list1.size());
 //				TODO
-//				warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+				warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
 			}
 			int i = list1.isEmpty() ? 0 : list1.size();
 			return Resp.scanSuccess("整托拣货" + i + "件", "整托拣货" + i + "件");
@@ -2700,7 +2700,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		jsonObject.put("num", stockupDTO.getNum());
 		//备货库位上架
 		//TODO
-//		warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+		warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
 		return Resp.scanSuccess("备货成功", "本次成功备货" + stockupDTO.getNum() + "件");
 	}
 

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

@@ -171,7 +171,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 					.eq(WarehouseUpdownStockupAreaEntity::getWarehouseId, warehouseId)
 					.eq(WarehouseUpdownStockupAreaEntity::getAssociationId, stockArticleEntity.getId())
 					.eq(WarehouseUpdownStockupAreaEntity::getAssociationValue, stockArticleEntity.getOrderCode())
-					.eq(WarehouseUpdownStockupAreaEntity::getAssociationValue, "3")
+					.eq(WarehouseUpdownStockupAreaEntity::getGoodsType, "3")
 				);
 				if (Func.isEmpty(updownStockupAreaEntity)) {
 					warehouseUpdownStockupArea.setAssociationValue(stockArticleEntity.getOrderCode());
@@ -181,7 +181,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 					warehouseUpdownStockupArea.setGoodsName(stockArticleEntity.getDescriptionGoods());
 					warehouseUpdownStockupArea.setMarketName(stockArticleEntity.getMallName());
 					warehouseUpdownStockupArea.setMarketId(stockArticleEntity.getMallId());
-					warehouseUpdownStockupArea.setGoodsType("2");
+					warehouseUpdownStockupArea.setGoodsType("3");
 					this.save(warehouseUpdownStockupArea);
 				} else {
 					int newNum = updownStockupAreaEntity.getNum() + num;
@@ -217,7 +217,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 		warehouseUpdownStockupAreaLogEntity.setNum(num);
 		warehouseUpdownStockupAreaLogService.save(warehouseUpdownStockupAreaLogEntity);
 		//修改库位状态
-		basicdataGoodsAllocationClient.updateAllocationStatus(stockUpAllocationId,"2");
+		basicdataGoodsAllocationClient.updateAllocationStatus(stockUpAllocationId,"3");
 		return null;
 	}