From 388d68b3ae99cfae3a9735a8563238077722f76a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Wed, 19 Jul 2023 16:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AF=B9=E5=BA=94=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/dao/basic/UdiRelevanceDao.java    |  1 +
 .../api/entity/inv/InnerOrderDetailEntity.java     |  2 +-
 .../glxp/api/req/basic/FilterUdiRelRequest.java    |  2 +-
 .../glxp/api/res/inv/innerOrderDetailResponse.java |  2 +-
 .../inv/impl/InvInnerOrderPrintServiceImpl.java    |  5 ++++-
 .../mybatis/mapper/basic/UdiRelevanceDao.xml       | 14 ++++++++++++++
 .../mybatis/mapper/inv/InnerOrderDetailDao.xml     |  5 +++--
 src/main/resources/schemas/schema_v2.1.sql         |  2 ++
 8 files changed, 27 insertions(+), 6 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 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<UdiRelevanceDao, UdiRelevanceEntity, UdiRelevanceEntity> {
 
     List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);
+    String selectPackLevel(@Param("nameCode") String nameCode);
 
 
     List<UdiRelevanceResponse> 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 @@
         </where>
         ORDER BY modifyTime DESC
     </select>
+    <select id="selectPackLevel" parameterType="java.lang.String"
+            resultType="java.lang.String">
+        select
+        basic_products.packLevel
+        FROM basic_udirel
+        inner JOIN basic_products
+        ON basic_products.uuid = basic_udirel.uuid
+        <where>
+            <if test="nameCode != '' and nameCode != null">
+                AND basic_products.nameCode = #{nameCode}
+            </if>
+        </where>
+
+    </select>
 
 
     <select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
diff --git a/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml
index c5b275b8..6ab25996 100644
--- a/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml
@@ -30,7 +30,7 @@
         replace
         INTO  inv_inner_order_detail
         (
-        orderIdFk,productId,productName,`count`,productDate,expireDate,batchNo
+        orderIdFk,productId,productName,`count`,productDate,expireDate,batchNo,nameCode
         )
         values (
         #{orderIdFk},
@@ -39,7 +39,8 @@
         #{count},
         #{productDate},
         #{expireDate},
-        #{batchNo}
+        #{batchNo},
+        #{nameCode}
         )
     </insert>
 
diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql
index 5cdded82..69eadbd0 100644
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/src/main/resources/schemas/schema_v2.1.sql
@@ -439,3 +439,5 @@ CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1);
 
 CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
 
+CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
+                         'varchar(255) ', 1);
\ No newline at end of file