From 0dec5c2ed004c063768b66d8d333243194c818ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Tue, 18 Jul 2023 09:13:47 +0800 Subject: [PATCH] =?UTF-8?q?=20=E7=94=9F=E6=88=90=E4=B8=8D=E4=BA=86?= =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E7=9A=84=E5=86=85=E9=83=A8=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=8F=98=E6=88=90=E4=B8=80=E7=BA=A7?= =?UTF-8?q?=E7=9A=84=E5=86=85=E9=83=A8=E7=A0=81=EF=BC=88=E7=89=87=E4=BB=94?= =?UTF-8?q?=E7=99=80=E8=AF=8A=E6=96=AD=E5=92=8C=E7=AE=A1=E7=90=86=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E9=83=BD=E6=9C=89=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/dao/basic/UdiRelevanceDao.java | 1 + .../com/glxp/api/dao/inv/InvInnerOrderPrintDao.java | 1 + .../glxp/api/entity/inv/InnerOrderDetailEntity.java | 1 + .../com/glxp/api/req/basic/FilterUdiRelRequest.java | 1 + .../glxp/api/res/inv/innerOrderDetailResponse.java | 1 + .../inv/impl/InvInnerOrderPrintServiceImpl.java | 5 ++++- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 13 +++++++++++++ .../mybatis/mapper/inv/InnerOrderDetailDao.xml | 6 ++++-- 8 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index 6580c5dda..3a81a024a 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -13,6 +13,7 @@ import java.util.List; public interface UdiRelevanceDao extends BaseMapperPlus { List filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest); + String selectPackLevel(@Param("nameCode") String nameCode); List filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest); diff --git a/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java b/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java index e4f317735..d72b3d591 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java @@ -12,4 +12,5 @@ public interface InvInnerOrderPrintDao extends BaseMapper filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest); List filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest); + } diff --git a/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java index cd135c6a3..ab6cb839d 100644 --- a/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java @@ -9,6 +9,7 @@ public class InnerOrderDetailEntity { private String orderIdFk; private String productId; private String productName; + private String nameCode; private Integer count; private String productDate; private String expireDate; 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 27e3f3c6c..2b28d185c 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -30,6 +30,7 @@ public class FilterUdiRelRequest extends ListPageRequest { private String lastUpdateTime; private String zczbhhzbapzbh; + private String packLevel; private Integer diType; diff --git a/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java index 6c02066d2..1ff8b90ed 100644 --- a/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java @@ -45,6 +45,7 @@ public class innerOrderDetailResponse { private int acceptCount; private String measname; private String supId; + private String nameCode; private String supName; } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 2e2b389e2..bd4e749bc 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -113,8 +113,11 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService innerOrderPrintEntity.setUpdateUser(customerService.getUserId() + ""); FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); filterUdiRelRequest.setId(Long.valueOf(obj.getProductId())); + filterUdiRelRequest.setPackLevel(udiRelevanceDao.selectPackLevel(obj.getNameCode())); + System.out.println(filterUdiRelRequest.getPackLevel()); //查询耗材字典信息 - UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); +// UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); + UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(Integer.parseInt(filterUdiRelRequest.getPackLevel())-1); //查询产品信息 UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode()); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 09a4eefb1..4569d2fce 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -121,7 +121,20 @@ ORDER BY modifyTime DESC +