From f7a1b24d29b6f415850c529f727859f35f9b83a5 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Apr 2024 20:56:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=A4=87=E8=B4=A7=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E6=89=AB=E6=8F=8F=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupAppController.java | 22 +++++++++---------- .../distribution/dto/app/StockupDTO.java | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index eba54c10f..901c0ed20 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -1436,8 +1436,8 @@ public class DistributionStockupAppController extends BladeController { entity.setType(2); entity.setAllocationId(stockupDTO.getAllocationId()); entity.setOutboundType(stockupEntity.getTypeService()); - entity.setStockupAreaId(stockupDTO.getStockupAllocationId()); - entity.setStockupArea(stockupDTO.getStockupAllocationName()); +// entity.setStockupAreaId(stockupDTO.getStockupAllocationId()); +// entity.setStockupArea(stockupDTO.getStockupAllocationName()); distributionStockService.save(entity); // //修改备货时间 distributionAsyncService.updateStockupStockListDate(stockupDTO); @@ -1464,7 +1464,7 @@ 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("stockUpAllocationId", stockupDTO.getStockupAllocationId()); jsonObject.put("type", 2); jsonObject.put("num", 1); //TODO @@ -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) { @@ -1613,8 +1613,8 @@ public class DistributionStockupAppController extends BladeController { entity.setConditions("0"); entity.setType(2); entity.setOutboundType(distributionStockupEntity.getTypeService()); - entity.setStockupArea(stockupDTO.getStockupAllocationName()); - entity.setStockupAreaId(stockupDTO.getStockupAllocationId()); +// entity.setStockupArea(stockupDTO.getStockupAllocationName()); +// entity.setStockupAreaId(stockupDTO.getStockupAllocationId()); distributionStockService.save(entity); //修改订单备货状态 distributionAsyncService.updateStockArticleStock(one.getStockArticleId()); @@ -1657,7 +1657,7 @@ 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("stockUpAllocationId", stockupDTO.getStockupAllocationId()); jsonObject.put("type", 2); jsonObject.put("num", 1); //进行了备货库位的选择才进行备货库位的上架 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java index 4c9d87751..6d3de9076 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java +++ b/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已完成 /** * 客户名城