From abf80eeb07248e9dfaed06f8c0a494a2015fcc1e Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 6 Dec 2024 16:27:23 +0800
Subject: [PATCH] =?UTF-8?q?12/6=20=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java  | 3 ++-
 src/main/java/com/glxp/api/res/inv/InvProductResponse.java     | 1 +
 src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml     | 1 +
 src/main/resources/mybatis/mapper/inv/invProductDao.xml        | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
index 370b7522d..5bf2f7ba8 100644
--- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
@@ -185,7 +185,8 @@ public class SysWorkplaceDocumentEntity {
     private Integer shipper;
 
     /**
-     * 收货方1:原始单据的收货方 2:原始单据的发货方 3:供应商,4:客户,5:特殊往来,6:内部科室,7填写
+     * 收货方5:原始单据的收货方 6:原始单据的发货方 2:供应商,1:客户,4:特殊往来,3:内部科室,7填写
+     * 以本备注为准!!!!!!
      */
     @TableField(value = "consignee")
     private Integer consignee;
diff --git a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java
index 3fd335ff4..b81bad8c4 100644
--- a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java
+++ b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java
@@ -230,5 +230,6 @@ public class InvProductResponse {
      */
     @TableField(value = "medicareType")
     private Integer medicareType;
+    private String packUnit;
 
 }
diff --git a/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml b/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml
index 4fe5b0a03..3fd79e2d1 100644
--- a/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml
@@ -31,6 +31,7 @@
         bp.productsType,
         bp.levelUnit,
         bp.prepnUnit,
+        bp.packUnit,
         bp.prepnSpec,
         bp.specialCode,
         bp.storageCondition,
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index cf4c7cf1c..3dac816b1 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -51,6 +51,7 @@
                bp.basicPrductRemak6,
                bp.basicPrductRemak7,
                bp.basicPrductRemak8,
+               bp.packUnit,
                ip.price
         from inv_product ip
                      inner join basic_udirel on ip.relIdFk = basic_udirel.id