From eba5a792a3bc4b2c72c9715ddbc26325d54233eb Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 21 Apr 2023 17:23:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E5=86=85=E9=83=A8?= =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java index 5a0c2bf7..797567e4 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java @@ -29,7 +29,10 @@ public class InnerOrderServiceImpl implements InnerOrderService { InnerOrderRequest innerOrderRequest = new InnerOrderRequest(); innerOrderRequest.setRecordKey(recordKey); List data = innerOrderDao.queryPageList(innerOrderRequest); - return data.get(0); + if(data!=null && data.size()>0){ + return data.get(0); + } + return new InnerOrderEntity(); } @Override From efc0e6d21f75041ef8e4ff820dbe0304601f306f Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 21 Apr 2023 17:33:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/res/inv/InvPreinProductResponse.java | 3 +++ src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java index 35940bb1..89342ad1 100644 --- a/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java @@ -105,4 +105,7 @@ public class InvPreinProductResponse { */ private String invCode; + //计量单位 + private String measname; + } diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml index 9633c6fc..edd54bf9 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml @@ -21,7 +21,8 @@ auth_dept.name deptName, auth_warehouse.name invName, ipp.deptCode, - ipp.invCode + ipp.invCode, + bp.measname from inv_prein_product ipp inner join basic_udirel on ipp.relIdFk = basic_udirel.id inner join basic_products bp on basic_udirel.uuid = bp.uuid From 349608fa52d7cba6d068e34345e3b1fb1660ef5b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Apr 2023 18:14:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A7=94=E6=89=98=E9=AA=8C=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoOrderReviewController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index a04da105..b2e04e38 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -427,6 +427,7 @@ public class IoOrderReviewController extends BaseController { public BaseResponse getReviewOrderSpms(@RequestBody ReviewSpmsRequest reviewSpmsRequest) { String billNo = reviewSpmsRequest.getBillNo(); + getUser(); if (StrUtil.isEmpty(reviewSpmsRequest.getBillNo())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); }