1.码表添加实际数量

2.码详情响应类数据添加单据ID字段

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;

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>