From 8bf6213970fd294211647f07e8b67a0f2ce7ddb2 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Sun, 13 Oct 2024 01:11:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E6=A8=A1=E5=9D=97=E7=9A=84=E6=9C=8D=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm-aftersales/src/main/resources/application-prod.yml | 2 +- .../logpm-aftersales/src/main/resources/application-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/resources/application-prod.yml b/blade-service/logpm-aftersales/src/main/resources/application-prod.yml index 6bef89294..07bea8516 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application-prod.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application-prod.yml @@ -1,6 +1,6 @@ #服务器端口 server: - port: 8900 + port: 8799 #数据源配置 #spring: diff --git a/blade-service/logpm-aftersales/src/main/resources/application-test.yml b/blade-service/logpm-aftersales/src/main/resources/application-test.yml index 9cb52f45e..9d128415e 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application-test.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application-test.yml @@ -1,6 +1,6 @@ #服务器端口 server: - port: 6000 + port: 8799 #数据源配置 #spring: From ddb9e24be42841ccfa8c0bc96981bc6d948a9c15 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sun, 13 Oct 2024 10:07:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WarehouseWarehousingEntryController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java index 25d3002e6..2b4507c22 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java @@ -118,8 +118,8 @@ public class WarehouseWarehousingEntryController extends BladeController { Map queryMap = (Map) request.get("query"); Query query = new Query(); - query.setSize((Integer) queryMap.get("size")); - query.setCurrent((Integer) queryMap.get("current")); + query.setSize((Integer) queryMap.get("pageSize")); + query.setCurrent((Integer) queryMap.get("currentPage")); QueryWrapper queryWrapper = Condition.getQueryWrapper(warehouseWarehousingEntry, WarehouseWarehousingEntryEntity.class); From d78c83a36779afc63128b2475a6e33f6325dc141 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sun, 13 Oct 2024 11:13:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...er.java => DistributionStockListPdaController.java} | 10 ++++++---- .../service/impl/DistributionStockListServiceImpl.java | 9 ++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) rename blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/{DistributionStockListPDAController.java => DistributionStockListPdaController.java} (75%) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockListPDAController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockListPdaController.java similarity index 75% rename from blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockListPDAController.java rename to blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockListPdaController.java index e477342d8..9ed09d42e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockListPDAController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockListPdaController.java @@ -6,8 +6,10 @@ import com.logpm.distribution.vo.app.DistributionMerchantStockListVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.SpringUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -17,17 +19,17 @@ import java.util.List; @RestController @RequestMapping("/app/stocklist") -@AllArgsConstructor @Api(value = "商家查看库存品", tags = "商家查看库存品") -public class DistributionStockListPDAController { +public class DistributionStockListPdaController extends BladeController { + @Autowired + private IDistributionStockListService distributionStockListService; @GetMapping("/list") @ApiOperationSupport(order = 1) @ApiOperation(value = "PDA查询库存品列表", notes = "DistributionStockListVO") - private R> getMerchantStockList(@RequestParam String materielCode){ - IDistributionStockListService distributionStockListService = SpringUtil.getBean(IDistributionStockListService.class); + public R> getMerchantStockList(@RequestParam String materielCode){ List stockListEntityList =distributionStockListService.getMerchantStockList(materielCode); return R.data(stockListEntityList); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java index 215973e80..564830dee 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java @@ -1164,7 +1164,14 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl getMerchantStockList(String materielCode) { BladeUser user = AuthUtil.getUser(); - List stockListEntities = baseMapper.getMerchantStockList(user.getTenantId(), materielCode); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DistributionStockListEntity::getCargoNumber, materielCode); + List stockListEntities = list(queryWrapper); + +// List stockListEntities = baseMapper.getMerchantStockList(user.getTenantId(), materielCode); + + List distributionMerchantStockListVOS = new ArrayList<>(); if (Func.isNotEmpty(stockListEntities)) { for (DistributionStockListEntity stockListEntity : stockListEntities) {