From 811f721067c1859b670392c275f35d4b9b1e8a30 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 9 Mar 2023 17:42:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 15 ++++++++++++++ .../com/glxp/api/dao/basic/UdiProductDao.java | 8 ++++++++ .../api/req/inv/AddInvRemindSetRequest.java | 20 +++++-------------- .../req/inv/FilterInvRemindMsgRequest.java | 10 ++++++++++ .../api/service/basic/UdiProductService.java | 8 +++++++- .../basic/impl/UdiProductServiceImpl.java | 5 +++++ .../mybatis/mapper/basic/UdiProductDao.xml | 7 +++++++ .../mybatis/mapper/inv/invProductDao.xml | 3 +-- 8 files changed, 58 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index e8354b6e0..a905af08a 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -628,4 +628,19 @@ public class UdiRelevanceController { //业务单据选入耗材字典查询列表 + /** + * 查询产品规格型号列表 + * + * @param relId + * @return + */ + @GetMapping("/udiwms/udiinfo/getGgxhList") + public BaseResponse getGgxhList(String relId) { + if (StrUtil.isBlank(relId)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + List ggxhList = udiProductService.getGgxhList(relId); + return ResultVOUtils.success(ggxhList); + } + } diff --git a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java index e6d22a4d9..aa1f28aca 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java @@ -60,4 +60,12 @@ public interface UdiProductDao { * @return */ Integer selectPackLevel(@Param("nameCode") String nameCode); + + /** + * 查询产品规格型号列表 + * + * @param relId + * @return + */ + List selectGgxhList(@Param("relId") String relId); } diff --git a/src/main/java/com/glxp/api/req/inv/AddInvRemindSetRequest.java b/src/main/java/com/glxp/api/req/inv/AddInvRemindSetRequest.java index 7759193d6..f27277960 100644 --- a/src/main/java/com/glxp/api/req/inv/AddInvRemindSetRequest.java +++ b/src/main/java/com/glxp/api/req/inv/AddInvRemindSetRequest.java @@ -15,6 +15,11 @@ public class AddInvRemindSetRequest { */ private String relId; + /** + * 规格型号 + */ + private String ggxh; + /** * 部门编码 */ @@ -35,11 +40,6 @@ public class AddInvRemindSetRequest { */ private Boolean lowStock; - /** - * 库存低于多少数量时预警 - */ - private Integer lowStockNum; - /** * 是否开启库存负数预警 */ @@ -50,11 +50,6 @@ public class AddInvRemindSetRequest { */ private Boolean overStock; - /** - * 库存高于多少数量时预警 - */ - private Integer overStockNum; - /** * 是否开启库存产品过期提醒 */ @@ -65,11 +60,6 @@ public class AddInvRemindSetRequest { */ private Boolean recentDate; - /** - * 近效期达到多少天时提醒 - */ - private Integer recentDateDay; - /** * 备注 */ diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java index 725f94842..6738ef6ed 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java @@ -19,6 +19,11 @@ public class FilterInvRemindMsgRequest extends ListPageRequest { */ private String batchNo; + /** + * 规格型号 + */ + private String ggxh; + /** * 部门编码 */ @@ -44,4 +49,9 @@ public class FilterInvRemindMsgRequest extends ListPageRequest { */ private String type; + /** + * 消息忽略状态： 0：不忽略；1：忽略7天；2：忽略15天；3：忽略30天 + */ + private Integer ignoreStatus; + } diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index 7a5efaef9..becb911f0 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -40,5 +40,11 @@ public interface UdiProductService { boolean deleteByUuid(String uuid); - + /** + * 查询产品规格型号列表 + * + * @param relId + * @return + */ + List getGgxhList(String relId); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 58a71a0e0..1f9e17fa5 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -124,4 +124,9 @@ public class UdiProductServiceImpl implements UdiProductService { public boolean deleteByUuid(String uuid) { return udiProductDao.deleteByUuid(uuid); } + + @Override + public List getGgxhList(String relId) { + return udiProductDao.selectGgxhList(relId); + } } diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index b7fa62766..922a15e7c 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -395,4 +395,11 @@ + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 9e5d6341e..56e349324 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -283,10 +283,9 @@ AND ipd.invSpaceCode = #{invSpaceCode} + group by ip.relIdFk, bp.ggxh - -