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 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}) @@ -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 fromCorp=#{fromCorp}, fromCorpId=#{fromCorpId}, `count`=#{count}, + `reCount`=#{reCount}, status=#{status}, supId=#{supId}, invStorageCode=#{invStorageCode},