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 57627010..2753ae2c 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/entity/inv/InnerOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java index cd135c6a..7d0d52be 100644 --- a/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java @@ -13,5 +13,5 @@ public class InnerOrderDetailEntity { private String productDate; private String expireDate; private String batchNo; - + private String nameCode; } 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 9906b810..0dc9be4f 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -17,7 +17,7 @@ public class FilterUdiRelRequest extends ListPageRequest { private String ggxh; private String thirdId; private Long id; - + private String packLevel; private String thirdId1; private String thirdId2; private String thirdId3; 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 6c02066d..52b3a3e7 100644 --- a/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java @@ -6,7 +6,7 @@ import java.math.BigDecimal; @Data public class innerOrderDetailResponse { - + private String nameCode; private String id; private String orderIdFk; private String productId; 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 f4c4b866..7fc5421d 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 @@ -110,8 +110,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 6993ad14..ffd86a3c 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -129,6 +129,20 @@ ORDER BY modifyTime DESC +