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

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

@@ -1657,11 +1657,10 @@ public class DistributionStockupAppController extends BladeController {
 					JSONObject jsonObject = new JSONObject();
 					jsonObject.put("warehouseId", myCurrentWarehouse.getId());
 					jsonObject.put("code",packetBarCode);
-//					jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
-					jsonObject.put("type", 2);
+					jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
+					jsonObject.put("type", 1);
 					jsonObject.put("num", 1);
 					//进行了备货库位的选择才进行备货库位的上架
-					//TODO
 					warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
 					//修改包件备货状态
 				DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();

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

@@ -149,6 +149,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 				this.save(warehouseUpdownStockupArea);
 				break;
 			case 2:
+				//库存
 				UpDownStockupAreaVO byPacketBarCodeAndWarehouseId = disStockListDetailClient.findByPacketBarCodeAndWarehouseId(warehouseId, code);
 				warehouseUpdownStockupArea.setAssociationValue(byPacketBarCodeAndWarehouseId.getAssociationValue());
 				warehouseUpdownStockupArea.setAssociationId(byPacketBarCodeAndWarehouseId.getAssociationId());