From d61ee074613902d799b637aaf027cf73ae03a1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 6 Jun 2023 10:27:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=A7=E5=93=81id=E7=B1=BB=E5=9E=8B=EF=BC=88long?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/basic/UdiRlSupController.java | 2 +- .../glxp/api/controller/inout/IoOrderMutiController.java | 3 --- .../controller/purchase/PurOrderReceiveController.java | 8 ++++---- .../glxp/api/entity/purchase/PurApplyDetailEntity.java | 2 +- .../glxp/api/entity/purchase/PurOrderDetailEntity.java | 2 +- .../com/glxp/api/entity/purchase/PurPlanDetailEntity.java | 2 +- .../java/com/glxp/api/req/basic/FilterUdiRelRequest.java | 2 +- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 3657a175b..44203cf3d 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -161,7 +161,7 @@ public class UdiRlSupController extends BaseController { } //查询详情id过滤 List purApplyDetailEntityList= purApplyDetailService.findByOrderId(companyProductRelevanceRequest.getId()); - List idList = purApplyDetailEntityList.stream().map(PurApplyDetailEntity::getProductId).collect(Collectors.toList()); + List idList = purApplyDetailEntityList.stream().map(PurApplyDetailEntity::getProductId).collect(Collectors.toList()); List basicInstrumentMaintainRelevanceResponses = null; FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest(); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java index 369ae0cc4..d530538ce 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java @@ -344,9 +344,6 @@ public class IoOrderMutiController { }else{ return ResultVOUtils.error(999,"请先设置多次出库单据类型!"); } - - - int sum = 0; QueryWrapper ew = new QueryWrapper<>(); ew.eq("mutiIdFk", ioOrderMutiUseEntity.getMutiIdFk()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 8e6dc744b..0b52be99c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -294,7 +294,7 @@ public class PurOrderReceiveController extends BaseController { List purApplyDetailEntityList = purReceiveDetailEntityList.stream().map(e -> { PurApplyDetailEntity d = new PurApplyDetailEntity(); d.setOrderIdFk(purApplyEntity.getId() + ""); - d.setProductId(e.getRelIdFk().intValue()); + d.setProductId(e.getRelIdFk()); UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode()); d.setProductName(udiProductEntity.getCpmctymc()); d.setCount(e.getCount()); @@ -331,7 +331,7 @@ public class PurOrderReceiveController extends BaseController { purPlanDetailEntityList = purReceiveDetailEntityList.stream().map(e -> { PurPlanDetailEntity d = new PurPlanDetailEntity(); d.setOrderIdFk(purPlanEntity.getId() + ""); - d.setProductId(e.getRelIdFk().intValue()); + d.setProductId(e.getRelIdFk()); UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode()); d.setProductName(udiProductEntity.getCpmctymc()); d.setCount(e.getCount()); @@ -371,7 +371,7 @@ public class PurOrderReceiveController extends BaseController { List purOrderDetailEntityList = purReceiveDetailEntityList.stream().map(e -> { PurOrderDetailEntity d = new PurOrderDetailEntity(); d.setOrderIdFk(purOrderEntity.getId() + ""); - d.setProductId(e.getRelIdFk().intValue()); + d.setProductId(e.getRelIdFk()); UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode()); d.setProductName(udiProductEntity.getCpmctymc()); d.setCount(e.getCount()); @@ -469,7 +469,7 @@ public class PurOrderReceiveController extends BaseController { List purOrderDetailEntityList = purPlanDetailEntityList.stream() .map(e -> { PurApplyDetailEntity d = new PurApplyDetailEntity(); - d.setProductId(e.getRelIdFk().intValue()); + d.setProductId(e.getRelIdFk()); UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode()); d.setProductName(udiProductEntity.getCpmctymc()); d.setCount(e.getCount()); diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java index 155707435..801b53df6 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java @@ -22,7 +22,7 @@ public class PurApplyDetailEntity { * 产品ID */ @TableField(value = "productId") - private Integer productId; + private Long productId; /** * 产品名称 diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java index 68ce2d74c..6bb2247e5 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java @@ -24,7 +24,7 @@ public class PurOrderDetailEntity { * 产品ID */ @TableField(value = "productId") - private Integer productId; + private Long productId; /** * 产品名称 diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java index 7f0bf462c..6216823ea 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java @@ -22,7 +22,7 @@ public class PurPlanDetailEntity { * 产品ID */ @TableField(value = "productId") - private Integer productId; + private Long productId; /** * 产品名称 diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 0b9f3b53f..02dcd5293 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -74,7 +74,7 @@ public class FilterUdiRelRequest extends ListPageRequest { private Boolean groupBuy; private List uuids; - private List ids; + private List ids; private String flbm; }