From 7f323f3e50c4b0770b1ef4e9f92bd684314610bd Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 2 Aug 2024 20:13:46 +0800 Subject: [PATCH] numlog --- .../sgzb/system/api/domain/BmNumLogs.java | 9 ++++++++ .../service/impl/BackReceiveServiceImpl.java | 21 +++++++++++++++++-- .../mapper/app/LeaseOutDetailsMapper.xml | 2 ++ .../system/service/impl/BmNumLogsService.java | 3 +++ .../mapper/system/BmNumLogsMapper.xml | 11 ++++++---- sgzb-ui/src/views/inventoryLogs/index.vue | 3 +++ 6 files changed, 43 insertions(+), 6 deletions(-) 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 f5b0a921..4b3a60aa 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 @@ -122,6 +122,15 @@ public class BmNumLogs extends BaseEntity { @Excel(name = "退库数量") private String backNum; + @Excel(name = "合格数量") + private String passNum; + + @Excel(name = "维修数量") + private String maintenanceNum; + + @Excel(name = "报废数量") + private String scrapNum; + @Excel(name = "出库类型 0编码出库 1数量出库 2成套出库") private String manageType; 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 e4e76a9b..55070562 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 @@ -179,6 +179,9 @@ public class BackReceiveServiceImpl implements BackReceiveService { record.setTypeId(s); int num = backReceiveMapper.getmaChineByCt(record); record.setNum(String.valueOf(num)); + int passNum = 0; + int maintenanceNum = 0; + int scrapNum = 0; if (allZeros) { //修改back_apply_details为已退料（1） res = updateStatus(record); @@ -207,6 +210,9 @@ public class BackReceiveServiceImpl implements BackReceiveService { throw new RuntimeException("ma_machines"); } + for (BackApplyInfo bi : hgList) { + passNum += bi.getBackNum(); + } } //维修的创建维修任务，插入任务协议表 @@ -218,6 +224,9 @@ public class BackReceiveServiceImpl implements BackReceiveService { res = insertTta(newTaskId, wxList); //插入维修记录表repair_apply_details res = insertRad(newTaskId, wxList); + for (BackApplyInfo bi : wxList) { + maintenanceNum += bi.getBackNum(); + } } //待报废的创建报废任务，插入任务协议表 @@ -229,6 +238,9 @@ public class BackReceiveServiceImpl implements BackReceiveService { res = insertTta(newTaskId, bfList); //插入维修记录表scrap_apply_details res = insertSad(newTaskId, bfList); + for (BackApplyInfo bi : bfList) { + scrapNum += bi.getBackNum(); + } } // 结算功能 List allList = backReceiveMapper.getAllList(record); @@ -240,8 +252,13 @@ public class BackReceiveServiceImpl implements BackReceiveService { } //完成退料的部分，更新 back_check_details 为 is_finished=1，此部分不支持撤回 - int count = finishBackCheckDetails(record); - record.setBackNum(count); + finishBackCheckDetails(record); + + //库存日志 + record.setBackNum(passNum+maintenanceNum+scrapNum); + record.setPassNum(passNum); + record.setMaintenanceNum(maintenanceNum); + record.setScrapNum(scrapNum); } } else { throw new RuntimeException("typeId为空"); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 9cb398f1..06922c9a 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -169,6 +169,8 @@ type_id = #{typeId} AND ma_id IS NULL + AND + status = '0' AND DATE(start_time) = CURDATE(); 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 d707ae84..c5036845 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 @@ -42,6 +42,9 @@ public class BmNumLogsService{ record.setInNum(des.getInNum()); //入库数 record.setOutNum(des.getOutNum()); // 出库数 record.setBackNum(des.getBackNum()); //退料数 + record.setPassNum(des.getPassNum()); //退料合格数量 + record.setMaintenanceNum(des.getMaintenanceNum()); //退料维修数量 + record.setScrapNum(des.getScrapNum()); //退料报废数量 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 5799becd..1357ddbf 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 @@ -18,6 +18,9 @@ + + + @@ -35,7 +38,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.`description`, bnl.json_result, bnl.create_time, bnl.creator, bnl.manage_type, + 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 from bm_num_logs bnl left join ma_type mt on bnl.type_id = mt.type_id @@ -75,13 +78,13 @@ 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, `status` + back_num, pass_num, maintenance_num, scrap_num, `status` ) 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}, #{status,jdbcType=VARCHAR} + #{backNum,jdbcType=VARCHAR}, #{passNum,jdbcType=VARCHAR}, #{maintenanceNum,jdbcType=VARCHAR}, #{scrapNum,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR} ) diff --git a/sgzb-ui/src/views/inventoryLogs/index.vue b/sgzb-ui/src/views/inventoryLogs/index.vue index cf4993f3..451a4ac4 100644 --- a/sgzb-ui/src/views/inventoryLogs/index.vue +++ b/sgzb-ui/src/views/inventoryLogs/index.vue @@ -115,6 +115,9 @@ export default { { label: '机具规格', content: 'typeName' }, { label: '申请数量', content: 'preNum' }, { label: '审核数量', content: 'auditNum' }, + { label: '合格数量', content: 'passNum' }, + { label: '维修数量', content: 'maintenanceNum' }, + { label: '报废数量', content: 'scrapNum' }, { label: '日期', content: 'createTime' }, ], logsDetailsInfo: {},