From ae7b4ac6ee7ec95590f08e1b867fd1ddc4865525 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 6 Nov 2025 17:22:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/common/core/constant/Constants.java | 4 +-- .../largeScreen/domain/CommonConstants.java | 4 +-- .../mapper/app/BackReceiveMapper.xml | 3 +- .../controller/BackApplyController.java | 10 +++++++ .../sgzb/material/domain/BackApplyInfo.java | 3 ++ .../sgzb/material/mapper/BackApplyMapper.java | 7 +++++ .../material/service/BackApplyService.java | 7 +++++ .../service/impl/BackApplyServiceImpl.java | 11 +++++++ .../mapper/material/BackApplyMapper.xml | 29 +++++++++++++++++++ .../mapper/material/ProjUsingRecordMapper.xml | 14 ++++----- sgzb-ui/src/views/newLogin.vue | 2 +- 11 files changed, 81 insertions(+), 13 deletions(-) diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java index f498d445..01d59265 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java @@ -155,8 +155,8 @@ public class Constants /** 机具设备分公司*/ public static final String JJ = "机具设备分公司"; - /** 调试分公司*/ - public static final String TS = "调试分公司"; + /** 变电施工二分公司*/ + public static final String TS = "变电施工二分公司"; /** 退库任务*/ public static final int BACK_TASK_TYPE = 36; //退料核查中 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java index 04f7b225..62630a64 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java @@ -13,8 +13,8 @@ public class CommonConstants { public static final String AQGQJ = "安全工器具"; /** 机具设备分公司*/ public static final String JJ = "机具设备分公司"; - /** 调试分公司*/ - public static final String TS = "调试分公司"; + /** 变电施工二分公司*/ + public static final String TS = "变电施工二分公司"; /** 机具分公司审核通过状态*/ public static final String MACHINERY_BRANCH_APPROVE_STATUS = "1"; diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index 0f9267a2..7cfe9a8e 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -1287,7 +1287,8 @@ LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id LEFT JOIN sys_user su ON su.user_id = baif.back_person - where 1=1 + where + bcd.is_finished = 1 and bpl.lot_id = #{lotId} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index 17299f17..b6a3e116 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -68,6 +68,16 @@ public class BackApplyController extends BaseController { return backApplyService.getUseTypeTree(bean); } + /** + * 在用设备类型表 + * @param bean + * @return + */ + @ApiOperation(value = "在用设备类型表") + @PostMapping("/getUseInfoList") + public AjaxResult getUseInfoList(@RequestBody BackApplyInfo bean) { + return backApplyService.getUseInfoList(bean); + } /** * 获取在用物料列表 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java index 4af11ac7..73cd8d46 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java @@ -298,4 +298,7 @@ public class BackApplyInfo extends BaseEntity { * */ private Integer pageSize; + + @ApiModelProperty(value = "总在用数量") + private Integer totalUseNum; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java index 042f403d..5509e64d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java @@ -185,4 +185,11 @@ public interface BackApplyMapper { * @return */ BackApplyInfo getList(BackApplyInfo backApplyInfo); + + /** + * 在用设备类型表 + * @param bean + * @return + */ + List getUseInfoList(BackApplyInfo bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java index 64830a71..78955108 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java @@ -144,4 +144,11 @@ public interface BackApplyService { * @param response */ void exportInfo(BackApplyInfo bean, HttpServletResponse response); + + /** + * 在用设备类型表 + * @param bean + * @return + */ + AjaxResult getUseInfoList(BackApplyInfo bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index fcf97220..90cdd508 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -619,6 +619,17 @@ public class BackApplyServiceImpl implements BackApplyService { } } + /** + * 在用设备类型表 + * @param bean + * @return + */ + @Override + public AjaxResult getUseInfoList(BackApplyInfo bean) { + // 根据协议id查询目前在用设备 + return AjaxResult.success(backApplyMapper.getUseInfoList(bean)); + } + /** * 导出退料单 * @param response diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index ddb8525d..16a3aab6 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -584,6 +584,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tt.task_status as taskStatus, tta.agreement_id as agreementId, GROUP_CONCAT(DISTINCT bad.type_id) as typeId, + GROUP_CONCAT(DISTINCT mt2.type_id) as thirdTypeId, GROUP_CONCAT(DISTINCT mt2.type_name) AS typeName, GROUP_CONCAT(bad.status) AS status FROM @@ -632,6 +633,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bai.back_source =#{backSource} GROUP BY bai.task_id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time + + HAVING FIND_IN_SET(#{typeId}, thirdTypeId) > 0 + ORDER BY bai.create_time desc @@ -1214,4 +1218,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bcd.type_id = #{typeId} GROUP By bcd.type_id + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml index fa6caacc..a5235283 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml @@ -92,18 +92,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt2.type_name AS typeName, mt.type_name AS typeModelName, mt.unit_name AS unit, - SUM(IFNULL(bcd.back_num, 0)) backNum - FROM back_check_details bcd - LEFT JOIN back_apply_info baif ON baif.id = bcd.parent_id + SUM(IFNULL(sai.num, 0)) backNum + FROM slt_agreement_info sai + LEFT JOIN back_apply_info baif ON baif.id = sai.back_id LEFT JOIN tm_task_agreement tta ON tta.task_id = baif.task_id LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id - LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id + LEFT JOIN ma_type mt ON mt.type_id = sai.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id - LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id + LEFT JOIN ma_machine mm ON mm.ma_id = sai.ma_id LEFT JOIN sys_user su ON su.user_id = baif.back_person - where 1=1 + where sai.`status` = 1 and (bai.agreement_code like concat('%',#{keyWord},'%') or bui.unit_name like concat('%',#{keyWord},'%') or @@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mt.type_name like concat('%',#{typeModelName},'%') - AND bcd.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') + AND sai.end_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') GROUP BY bai.agreement_id, mt.type_id) AS subquery2 ON subquery1.type_id = subquery2.type_id diff --git a/sgzb-ui/src/views/newLogin.vue b/sgzb-ui/src/views/newLogin.vue index 3c1dee7e..f9df16c1 100644 --- a/sgzb-ui/src/views/newLogin.vue +++ b/sgzb-ui/src/views/newLogin.vue @@ -522,7 +522,7 @@ export default { .then(async () => { this.loading = false localStorage.setItem('notice', true) - + const username = this.loginForm.username.trim() const password = encrypt(this.loginForm.password) localStorage.setItem('username', username)