From 8be5da50d63ce73f5ae1fed6796f84cdbd965da5 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 5 Aug 2022 17:43:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=A0=81=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E6=95=B0=E9=87=8F=202.=E7=A0=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E7=B1=BB=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AEID=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/admin/res/inout/WarehouseResponse.java   | 1 +
 .../src/main/resources/mybatis/mapper/inout/CodesDao.xml  | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java
index cbdc55db..b378b361 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java
@@ -16,6 +16,7 @@ public class WarehouseResponse {
     private long id;
     private String fromCorp;
     private Integer count;
+    private String orderId;
     private String batchNo;
     private String produceDate;
     private String expireDate;
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml
index c8f96225..2cd7392b 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml
@@ -41,7 +41,7 @@
     <insert id="insertWarehouse" keyProperty="id" parameterType="com.glxp.api.admin.req.inout.WarehouseSaveRequest">
         INSERT INTO io_codes(`action`, mainAction, code, corpOrderId, actor, actDate,
                              fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate,
-                             serialNo, `count`, packageLevel, warehouseCode, nameCode, supId, relId, status,
+                             serialNo, `count`, reCount, packageLevel, warehouseCode, nameCode, supId, relId, status,
                              invStorageCode, invWarehouseCode, locStorageCode)
         values (#{action},
                 #{mainAction},
@@ -51,7 +51,7 @@
                 #{actDate},
                 #{fromCorpId},
                 #{fromCorp}, #{orderId}, #{batchNo}, #{produceDate}, #{expireDate}, #{serialNo}, #{count},
-                #{packageLevel}, #{warehouseCode},
+                #{reCount}, #{packageLevel}, #{warehouseCode},
                 #{nameCode}, #{supId}, #{relId}, #{status}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode})
     </insert>
 
@@ -64,7 +64,7 @@
         actor,
         actDate,
         fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate,
-        serialNo,`count`,packageLevel,warehouseCode,nameCode,supId,
+        serialNo,`count`, reCount, packageLevel,warehouseCode,nameCode,supId,
         relId,status,invStorageCode,invWarehouseCode,locStorageCode)
         VALUES
         <foreach collection="io_codesEntities" item="item" index="index"
@@ -84,6 +84,7 @@
             ,#{item.expireDate}
             ,#{item.serialNo}
             ,#{item.count}
+            ,#{item.reCount}
             ,#{item.packageLevel} ,#{item.warehouseCode},#{item.nameCode},#{item.supId}
             ,#{item.relId},#{item.status},#{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode})
 
@@ -161,6 +162,7 @@
             <if test="fromCorp != null">fromCorp=#{fromCorp},</if>
             <if test="fromCorpId != null">fromCorpId=#{fromCorpId},</if>
             <if test="count != null">`count`=#{count},</if>
+            <if test="reCount != null">`reCount`=#{reCount},</if>
             <if test="status != null">status=#{status},</if>
             <if test="supId != null">supId=#{supId},</if>
             <if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>