From 49aa9ee4070374dd149695f0a7494181944e0a3e Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 27 Jul 2023 09:33:39 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A4=87=E8=B4=A7=E6=89=AB=E7=A0=81=E8=A1=A8?= =?UTF-8?q?=E5=8A=A0=E5=85=A5type=E5=8C=BA=E5=88=86=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E5=92=8C=E5=8C=85=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionStockEntity.java | 3 +++ .../DistributionStockupAppController.java | 2 ++ .../controller/PanFactoryDataController.java | 27 +++++++++---------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java index e8c4ccffa..16fb6764e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java @@ -145,4 +145,7 @@ public class DistributionStockEntity extends TenantEntity { @ApiModelProperty(value = "备货区") private String stockupArea; + @ApiModelProperty(value = "扫码类型 1包件 2库存品") + private Integer type; + } 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 f62ada299..24d3cc1c8 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 @@ -245,6 +245,7 @@ public class DistributionStockupAppController extends BladeController { entity.setStockupArea(stockupArea); entity.setReservationId(reservationId); entity.setConditions(0); + entity.setType(2); distributionStockService.save(entity); Map map = new HashMap<>(); @@ -289,6 +290,7 @@ public class DistributionStockupAppController extends BladeController { entity.setReservationId(reservationId); entity.setStockListId(stockListId); entity.setConditions(0); + entity.setType(2); distributionStockService.save(entity); Map map = new HashMap<>(); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java index d275a6ac7..223cfa0e1 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java @@ -37,7 +37,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.util.Map; import java.util.Objects; /** @@ -133,19 +132,19 @@ public class PanFactoryDataController extends BladeController { } - @ResponseBody - @PostMapping("/test") - @ApiOperationSupport(order = 1) - @ApiOperation(value = "通常数据推送", notes = "传入factoryOrderDTO") - public Resp test(@RequestBody Map map) { - String unitNo = (String) map.get("unitNo"); - - - //真正的处理需要的数据 - panFactoryDataService.handleDataToPlatform("CS0011061260002",null); - - return null; - } +// @ResponseBody +// @PostMapping("/test") +// @ApiOperationSupport(order = 1) +// @ApiOperation(value = "通常数据推送", notes = "传入factoryOrderDTO") +// public Resp test(@RequestBody Map map) { +// String unitNo = (String) map.get("unitNo"); +// +// +// //真正的处理需要的数据 +// panFactoryDataService.handleDataToPlatform("CS0011061260002",null); +// +// return null; +// } }