From 135981aca16e519997d9744d94c51dba687216f4 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 19 Nov 2024 17:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/entity/basic/UdiProductEntity.java    | 6 ++++--
 .../java/com/glxp/api/service/inout/IoAddInoutService.java  | 2 +-
 src/main/resources/mybatis/mapper/basic/UdiProductDao.xml   | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
index d17caf90..7e8934c3 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
@@ -124,9 +124,10 @@ public class UdiProductEntity {
     @TableField(value = "price")
     private String price;
 
-    @TableField(exist = false)
     //本地生成信息
+    @TableField(exist = false)
     private String batchNo;
+    @TableField(exist = false)
     private String produceDate;
     @TableField(exist = false)
     private String expireDate;
@@ -175,7 +176,7 @@ public class UdiProductEntity {
     private String categoryName;
     @TableField(value = "updateTime")
     private Date updateTime;
-    @TableField(value = "useNum")
+    @TableField(exist = false)
     private Integer useNum;
     @TableField(value = "updateUser")
     private String updateUser;
@@ -231,6 +232,7 @@ public class UdiProductEntity {
     private Integer hcType;
     @TableField(value = "requireScanCode")
     private Integer requireScanCode;
+    @TableField(exist = false)
     private Boolean isStack;
 
 
diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
index e2c3b903..a7645a75 100644
--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@@ -754,7 +754,7 @@ public class IoAddInoutService {
         ioOrderDetailCodeEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc());
         ioOrderDetailCodeEntity.setManufacturer(udiRelevanceResponse.getManufactory());
         ioOrderDetailCodeEntity.setMeasname(udiRelevanceResponse.getMeasname());
-        ioOrderDetailCodeEntity.setSpec(udiRelevanceResponse.getGgxh());
+        ioOrderDetailCodeEntity.setSpec(StrUtil.isEmpty(udiRelevanceResponse.getGgxh()) ? "" : udiRelevanceResponse.getBzgg());
         ioOrderDetailCodeEntity.setSupId(codeTempEntity.getSupId());
         ioOrderDetailCodeEntity.setProductType(codeTempEntity.getProductType());
 
diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
index 6408c47b..34ade0d7 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -697,6 +697,9 @@
             <if test="productType != null">
                 productType=#{productType},
             </if>
+            <if test="productsType != null">
+                productsType=#{productsType},
+            </if>
             <if test="scbssfbhph != null">
                 scbssfbhph=#{scbssfbhph},
             </if>