From c09594fafcbeebfc3a148fa65dd56100bb2796ea Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 9 Sep 2024 17:06:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=85=E8=A3=85=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/mipsdl/client/ctqyy/CtqyyClient.java    |  2 ++
 .../com/glxp/mipsdl/entity/ctqyy/VYpzsIoInfo.java    | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
index ba389b7..155b80a 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -1498,8 +1498,10 @@ public class CtqyyClient extends CommonHttpClient {
                         detail.setCpmctymc(entity.getPHYSIC_NAME());
                         detail.setBatchNo(entity.getBATCH_NO());
                         detail.setCount(entity.getQUANTITY());
+                        detail.setYbbm(entity.getCOUNTRY_CODE());
                         detail.setOrderIdFk(info.getPHYSIC_CODE());
                         detail.setMeasureUnit(entity.getPACK_UNIT1());
+                        detail.setGgxh(entity.getPACK_SPEC() + ":" + entity.getPHYSIC_UNIT());
                         detailList.add(detail);
                     });
                     collectOrder.setBizList(detailList);
diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsIoInfo.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsIoInfo.java
index 2f7682c..9bf6dde 100644
--- a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsIoInfo.java
+++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsIoInfo.java
@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
 import lombok.Data;
 
 @Data
@@ -72,5 +74,15 @@ public class VYpzsIoInfo implements Serializable {
     @TableField(value = "RETAIL_MONEY")
     private BigDecimal RETAIL_MONEY;
 
+    @TableField(value = "PACK_SPEC")
+    private String PACK_SPEC;
+
+    @TableField(value = "PHYSIC_UNIT")
+    private String PHYSIC_UNIT;
+
+    @TableField(value = "COUNTRY_CODE")
+    private String COUNTRY_CODE;
+
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file