diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java index 4b3a60aa..08ae6870 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java @@ -131,6 +131,9 @@ public class BmNumLogs extends BaseEntity { @Excel(name = "报废数量") private String scrapNum; + @Excel(name = "操作后库存") + private String postStoreNum; + @Excel(name = "出库类型 0编码出库 1数量出库 2成套出库") private String manageType; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index 9b416e81..25a70464 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -236,4 +236,7 @@ public class BackApplyInfo { /**0:未完成退料,可以撤回 1:已完成退料,不能撤回*/ private Integer isFinished; + + /** 操作后库存 */ + private String postStoreNum; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 55070562..baca46c2 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -259,6 +259,8 @@ public class BackReceiveServiceImpl implements BackReceiveService { record.setPassNum(passNum); record.setMaintenanceNum(maintenanceNum); record.setScrapNum(scrapNum); + int postStoreNum = backReceiveMapper.getmaChineByCt(record); + record.setPostStoreNum(String.valueOf(postStoreNum)); } } else { throw new RuntimeException("typeId为空"); diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java index c5036845..d9d5c394 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java @@ -45,6 +45,7 @@ public class BmNumLogsService{ record.setPassNum(des.getPassNum()); //退料合格数量 record.setMaintenanceNum(des.getMaintenanceNum()); //退料维修数量 record.setScrapNum(des.getScrapNum()); //退料报废数量 + record.setPostStoreNum(des.getPostStoreNum()); //操作后库存数 record.setManageType(des.getManageType()); record.setTaskId(des.getTaskId()); record.setTypeId(des.getTypeId()); diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml index 1357ddbf..00967889 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml @@ -21,6 +21,7 @@ + @@ -39,7 +40,7 @@ select bnl.id, bnl.model_title, bnl.`method`, bnl.task_id, bnl.type_id, bnl.pre_num, bnl.audit_num, bnl.pre_store_num, bnl.in_num, bnl.out_num, bnl.back_num, bnl.pass_num, bnl.maintenance_num, bnl.scrap_num, bnl.`description`, bnl.json_result, bnl.create_time, bnl.creator, bnl.manage_type, - bnl.remark, bnl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name + bnl.remark, bnl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name, bnl.post_store_num from bm_num_logs bnl left join ma_type mt on bnl.type_id = mt.type_id inner join ma_type mt1 on mt.parent_id = mt1.type_id @@ -51,7 +52,7 @@ select bnl.id, bnl.model_title, bnl.`method`, bnl.task_id, bnl.type_id, bnl.pre_num, bnl.audit_num, bnl.pre_store_num, bnl.in_num, bnl.out_num, bnl.back_num, bnl.pass_num, bnl.maintenance_num, bnl.scrap_num, bnl.`description`, bnl.json_result, bnl.create_time, bnl.creator, bnl.manage_type, - bnl.remark, bnl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name + bnl.remark, bnl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name, bnl.post_store_num from bm_num_logs bnl left join ma_type mt on bnl.type_id = mt.type_id inner join ma_type mt1 on mt.parent_id = mt1.type_id @@ -78,13 +79,14 @@ description, json_result, create_time, creator, remark, pre_num, input_num, out_num, audit_num, manage_type, type_name, type_model_name, pre_store_num, in_num, - back_num, pass_num, maintenance_num, scrap_num, `status` + back_num, pass_num, maintenance_num, scrap_num, `status`, post_store_num ) values (#{modelTitle,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR}, #{typeId,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR}, #{jsonResult,jdbcType=VARCHAR}, now(), #{creator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{preNum,jdbcType=VARCHAR}, #{inputNum,jdbcType=VARCHAR}, #{outNum,jdbcType=VARCHAR}, #{auditNum,jdbcType=VARCHAR}, #{manageType,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR}, #{typeModelName,jdbcType=VARCHAR}, #{preStoreNum,jdbcType=VARCHAR}, #{inNum,jdbcType=VARCHAR}, - #{backNum,jdbcType=VARCHAR}, #{passNum,jdbcType=VARCHAR}, #{maintenanceNum,jdbcType=VARCHAR}, #{scrapNum,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR} + #{backNum,jdbcType=VARCHAR}, #{passNum,jdbcType=VARCHAR}, #{maintenanceNum,jdbcType=VARCHAR}, #{scrapNum,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, + #{postStoreNum,jdbcType=VARCHAR} ) diff --git a/sgzb-ui/src/views/inventoryLogs/index.vue b/sgzb-ui/src/views/inventoryLogs/index.vue index f343d829..e76b0fbc 100644 --- a/sgzb-ui/src/views/inventoryLogs/index.vue +++ b/sgzb-ui/src/views/inventoryLogs/index.vue @@ -43,6 +43,7 @@ + - +