diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 49f1048b..75540bce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -798,6 +798,19 @@ public class WareHouseController { } else if (udiRelevanceResponse.getIsUseDy() == 0 && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) { return ResultVOUtils.error(500, "该产品不允许以使用单元入库!"); } + + //计算实际数量 + int actCount = 0; + if (udiRelevanceResponse.getIsUseDy() == 1 && udiRelevanceResponse.getDiType() != 2) { + if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { + actCount = udiRelevanceResponse.getZxxsbzbhsydysl(); + } else { + actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getBhzxxsbzsl(); + } + } else { + actCount = udiRelevanceResponse.getBhzxxsbzsl(); + } + warehouseEntity.setReCount(warehouseEntity.getCount() * actCount); } else if (udiRelevanceResponses.size() == 0) { if (unitFk == null) return ResultVOUtils.error(500, "耗材字典不存在此产品!"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java index 6175c1f3..21f9c711 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java @@ -18,7 +18,8 @@ public class WarehouseEntity { private String produceDate; private String expireDate; private String serialNo; - private Integer count; + private Integer count; //扫码数量 + private Integer reCount; //实际数量 private String packageLevel; private String warehouseCode; diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml index e318be9b..f3e86eb3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml @@ -15,7 +15,7 @@ (`action`, mainAction,code, corpOrderId, actor,actDate, fromCorpId, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo, - `count`,nameCode,supId,invStorageCode,invWarehouseCode,locStorageCode,relId) + `count`, reCount, nameCode,supId,invStorageCode,invWarehouseCode,locStorageCode,relId) VALUES @@ -33,7 +33,9 @@ ,#{item.produceDate} ,#{item.expireDate} ,#{item.serialNo} - ,#{item.count},#{item.nameCode},#{item.supId}, + ,#{item.count} + ,#{item.reCount} + ,#{item.nameCode},#{item.supId}, #{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode},#{item.relId} ) @@ -43,7 +45,7 @@ INSERT INTO io_codes_temp(`action`, mainAction, code, corpOrderId, actor, actDate, fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo, - `count`, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId) + `count`, reCount, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId) values (#{action}, #{mainAction}, #{code}, @@ -57,7 +59,9 @@ #{produceDate}, #{expireDate}, #{serialNo}, - #{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId}) + #{count}, + #{reCount}, + #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId}) @@ -67,7 +71,7 @@ ignore INTO io_codes_temp(`action`, mainAction, code, corpOrderId, actor, actDate, fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo, - `count`, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId) + `count`, reCount, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId) values ( #{action}, #{mainAction}, @@ -83,6 +87,7 @@ #{expireDate}, #{serialNo}, #{count}, + #{reCount}, #{nameCode}, #{supId}, #{invStorageCode}, @@ -131,6 +136,7 @@ UPDATE io_codes_temp `count`=#{count}, + `reCount`=#{reCount}, `action`=#{action}, `mainAction`=#{mainAction}, `fromCorpId`=#{fromCorpId}, @@ -162,6 +168,7 @@ `serialNo`=#{serialNo}, `relId`=#{relId}, `count`=#{count}, + `reCount`=#{reCount}, WHERE id=#{id}