diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 1a9c92e..3a17895 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -812,6 +812,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, "耗材字典不存在此产品!"); @@ -819,7 +832,6 @@ public class WareHouseController { return ResultVOUtils.error(500, "当前供应商不存在此配送产品!"); } - //校验供应商是否配送此产品 BaseResponse corpResponse = checkCorp(warehouseEntity, bussinessTypeEntity); if (corpResponse != null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java index 95aeed6..67d45f4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/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 c6b69d4..b0c0d1c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml @@ -14,7 +14,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 @@ -32,7 +32,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 @@ parameterType="com.glxp.sale.admin.entity.inout.WarehouseEntity"> 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,14 +59,16 @@ #{produceDate}, #{expireDate}, #{serialNo}, - #{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId}) + #{count}, + #{reCount}, + #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId}) replace INTO io_codes_temp(id,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 (#{id},#{action}, #{mainAction}, #{code}, @@ -78,7 +82,9 @@ #{produceDate}, #{expireDate}, #{serialNo}, - #{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId}) + #{count}, + #{reCount}, + #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId})