From 1d273580e5c56e108ef64c7d4fa5964f975a2bfc Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sun, 18 Aug 2024 09:03:29 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/material/StorageStatusMapper.xml | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml index 28b9058..3a3f7b6 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml @@ -8,12 +8,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT mt2.type_name as typeName, mt.type_name as typeModelName, mt.unit_name as unit, - IFNULL(mt.num, 0) as num, + CASE mt.manage_type + WHEN 0 THEN + IFNULL(subquery0.num, 0) + ELSE + IFNULL(mt.num, 0) + END as num, IFNULL(subquery1.usNum, 0) as usNum, IFNULL(subquery2.repairNum, 0) as repairNum, IFNULL(subquery3.repairInputNum, 0) as repairInputNum, IFNULL(subquery4.inputNum, 0) as inputNum, - IFNULL(mt.num, 0) + IFNULL(subquery1.usNum, 0) + IFNULL(subquery2.repairNum, 0) + IFNULL(subquery3.repairInputNum, 0) as allNum, + CASE mt.manage_type + WHEN 0 THEN + IFNULL(subquery0.num, 0)+ IFNULL(subquery1.usNum, 0) + IFNULL(subquery2.repairNum, 0) + IFNULL(subquery3.repairInputNum, 0) + ELSE + IFNULL(mt.num, 0)+ IFNULL(subquery1.usNum, 0) + IFNULL(subquery2.repairNum, 0) + IFNULL(subquery3.repairInputNum, 0) + END as allNum, CASE mt.manage_type WHEN 0 THEN '否' @@ -22,6 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" END manageType FROM ma_type mt + LEFT JOIN (SELECT mt.type_id, + mt2.type_name AS typeName, + mt.type_name AS typeModelName, + count(mm.ma_id) num + FROM ma_machine mm + LEFT JOIN ma_type mt ON mt.type_id = mm.type_id + LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + WHERE mm.ma_code is not null and mm.ma_status in (15) + GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt.type_id LEFT JOIN (SELECT subquery1.type_id, subquery1.typeName, subquery1.typeModelName, From ee70d65a5cad32d793f249d24b6136dd88fcc991 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sun, 18 Aug 2024 09:26:06 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java | 2 ++ .../app/service/impl/LeaseOutDetailsServiceImpl.java | 6 +++++- .../resources/mapper/app/LeaseOutDetailsMapper.xml | 11 +++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index 0036e6c..0d1198a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java @@ -92,6 +92,8 @@ public interface LeaseOutDetailsMapper { MaType selectByTypeId(@Param("record") LeaseOutDetails record); + int getCountOfCodeMachine(@Param("record") LeaseOutDetails record); + LeaseApplyDetails getOutboundNum(LeaseOutDetails record); List getMaTypeDetails(LeaseOutDetails record); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 93fdeea..85c13fb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -201,7 +201,11 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { //判断(ma_type 设备规格表)中的库存够不够出库的 MaType maType = leaseOutDetailsMapper.selectByTypeId(record); if (maType != null) { - return maType.getNum().intValue(); + if ("1".equals(maType.getManageType())) { + return maType.getNum().intValue(); + } else { + return leaseOutDetailsMapper.getCountOfCodeMachine(record); + } } return 0; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index ce559e0..4ec307b 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -176,6 +176,17 @@ select * from ma_type WHERE type_id = #{record.typeId} + UPDATE From bb561624e5f21f1168a94bbc973fb8cc1c0ac25b Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sun, 18 Aug 2024 09:28:10 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/app/LeaseOutDetailsMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 4ec307b..506e720 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -178,8 +178,8 @@ + /*根据标段工程id关联协议查询往来单位*/ + + SELECT DISTINCT bui.unit_id AS id, + bui.unit_name AS `name` + FROM bm_project_lot bpl + LEFT JOIN bm_agreement_info bai ON bpl.lot_id = bai.project_id AND bai.`status` = '1' + LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id AND bui.del_flag = '0' + WHERE bpl.lot_id = #{id} AND bpl.del_flag = '0' + + + SELECT unit_id AS id, + unit_name AS `name` + FROM bm_unit_info + WHERE del_flag = '0' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java index e70ae20..736c8f6 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java @@ -1,126 +1,126 @@ -package com.bonus.sgzb.system.controller; - -import com.bonus.sgzb.common.core.web.domain.AjaxResult; -import com.bonus.sgzb.system.domain.SelectDto; -import com.bonus.sgzb.system.service.SelectService; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - * @author 10488 - * 统一下拉选 - */ -@RestController -@RequestMapping("/select/") -public class SelectController { - - @Resource(name = "SelectService") - private SelectService service; - - @ApiOperation(value = "往来单位下拉选") - @PostMapping("getUnitCbx") - public AjaxResult getUnitData(@RequestBody SelectDto dto) { - return service.getUnitData(dto); - } - - @ApiOperation(value = "工程下拉选") - @PostMapping("getSectionEngineeringCbx") - public AjaxResult getProData(@RequestBody SelectDto dto) { - return service.getProData(dto); - } - - @ApiOperation(value = "机具类型下拉选") - @PostMapping("getMaTypeData") - public AjaxResult getMaTypeData(@RequestBody SelectDto dto){ - return service.getMaTypeData(dto); - } - - @ApiOperation(value = "数据字典下拉选") - @PostMapping("getDictByPidCbx") - public AjaxResult getDictByPidCbx(@RequestBody SelectDto dto){ - return service.getDictByPidCbx(dto); - } - - @ApiOperation(value = "单位树/归属部门/所属上级") - @PostMapping("getDeptTree") - public AjaxResult getDeptTree(@RequestBody SelectDto dto){ - return service.getDeptTree(dto); - } - - @ApiOperation(value = "岗位下拉选") - @PostMapping("getPostCbx") - public AjaxResult getPostCbx(@RequestBody SelectDto dto){ - return service.getPostCbx(dto); - } - - @ApiOperation(value = "角色下拉选") - @PostMapping("getRoleCbx") - public AjaxResult getRoleCbx(@RequestBody SelectDto dto){ - return service.getRoleCbx(dto); - } - - @ApiOperation(value = "单位类型下拉选") - @PostMapping("getUnitTypeCbx") - public AjaxResult getUnitTypeCbx(@RequestBody SelectDto dto){ - return service.getUnitTypeCbx(dto); - } - - @ApiOperation(value = "设备类型树") - @PostMapping("getDeviceTypeTree") - public AjaxResult getDeviceTypeTree(@RequestBody SelectDto dto){ - return service.getDeviceTypeTree(dto); - } - - @ApiOperation(value = "资产属性") - @PostMapping("getAssetAttributesCbx") - public AjaxResult getAssetAttributesCbx(@RequestBody SelectDto dto){ - return service.getAssetAttributesCbx(dto); - } - - @ApiOperation(value = "机具厂家") - @PostMapping("getDeviceFactoryCbx") - public AjaxResult getDeviceFactoryCbx(@RequestBody SelectDto dto){ - return service.getDeviceFactoryCbx(dto); - } - - @ApiOperation(value = "工程项目") - @PostMapping("getProCbx") - public AjaxResult getProCbx(@RequestBody SelectDto dto){ - return service.getProCbx(dto); - } - - @ApiOperation(value = "配件所属上级树") - @PostMapping("getAccessoryTree") - public AjaxResult getAccessoryTree(){ - return service.getAccessoryTree(); - } - - @ApiOperation(value = "配件所属上级树") - @PostMapping("getPartTree") - public AjaxResult getPartTree(@RequestBody SelectDto dto){ - return service.getPartTree(dto); - } - - @ApiOperation(value = "货架") - @PostMapping("getGoodsShelvesCbx") - public AjaxResult getGoodsShelvesCbx(@RequestBody SelectDto dto){ - return service.getGoodsShelvesCbx(dto); - } - - @ApiOperation(value = "用户/维修员/库管员/采购员") - @PostMapping("getUserByRoleIdCbx") - public AjaxResult getUserByRoleIdCbx(@RequestBody SelectDto dto){ - return service.getUserByRoleIdCbx(dto); - } - - @ApiOperation(value = "往来单位id和标段工程id获取协议信息") - @PostMapping("getAgreementInfoById") - public AjaxResult getAgreementInfoById(@RequestBody SelectDto dto){ - return service.getAgreementInfoById(dto); - } -} +//package com.bonus.sgzb.system.controller; +// +//import com.bonus.sgzb.common.core.web.domain.AjaxResult; +//import com.bonus.sgzb.system.domain.SelectDto; +//import com.bonus.sgzb.system.service.SelectService; +//import io.swagger.annotations.ApiOperation; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestBody; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import javax.annotation.Resource; +// +///** +// * @author 10488 +// * 统一下拉选 +// */ +//@RestController +//@RequestMapping("/select/") +//public class SelectController { +// +// @Resource(name = "SelectService") +// private SelectService service; +// +// @ApiOperation(value = "往来单位下拉选") +// @PostMapping("getUnitCbx") +// public AjaxResult getUnitData(@RequestBody SelectDto dto) { +// return service.getUnitData(dto); +// } +// +// @ApiOperation(value = "工程下拉选") +// @PostMapping("getSectionEngineeringCbx") +// public AjaxResult getProData(@RequestBody SelectDto dto) { +// return service.getProData(dto); +// } +// +// @ApiOperation(value = "机具类型下拉选") +// @PostMapping("getMaTypeData") +// public AjaxResult getMaTypeData(@RequestBody SelectDto dto){ +// return service.getMaTypeData(dto); +// } +// +// @ApiOperation(value = "数据字典下拉选") +// @PostMapping("getDictByPidCbx") +// public AjaxResult getDictByPidCbx(@RequestBody SelectDto dto){ +// return service.getDictByPidCbx(dto); +// } +// +// @ApiOperation(value = "单位树/归属部门/所属上级") +// @PostMapping("getDeptTree") +// public AjaxResult getDeptTree(@RequestBody SelectDto dto){ +// return service.getDeptTree(dto); +// } +// +// @ApiOperation(value = "岗位下拉选") +// @PostMapping("getPostCbx") +// public AjaxResult getPostCbx(@RequestBody SelectDto dto){ +// return service.getPostCbx(dto); +// } +// +// @ApiOperation(value = "角色下拉选") +// @PostMapping("getRoleCbx") +// public AjaxResult getRoleCbx(@RequestBody SelectDto dto){ +// return service.getRoleCbx(dto); +// } +// +// @ApiOperation(value = "单位类型下拉选") +// @PostMapping("getUnitTypeCbx") +// public AjaxResult getUnitTypeCbx(@RequestBody SelectDto dto){ +// return service.getUnitTypeCbx(dto); +// } +// +// @ApiOperation(value = "设备类型树") +// @PostMapping("getDeviceTypeTree") +// public AjaxResult getDeviceTypeTree(@RequestBody SelectDto dto){ +// return service.getDeviceTypeTree(dto); +// } +// +// @ApiOperation(value = "资产属性") +// @PostMapping("getAssetAttributesCbx") +// public AjaxResult getAssetAttributesCbx(@RequestBody SelectDto dto){ +// return service.getAssetAttributesCbx(dto); +// } +// +// @ApiOperation(value = "机具厂家") +// @PostMapping("getDeviceFactoryCbx") +// public AjaxResult getDeviceFactoryCbx(@RequestBody SelectDto dto){ +// return service.getDeviceFactoryCbx(dto); +// } +// +// @ApiOperation(value = "工程项目") +// @PostMapping("getProCbx") +// public AjaxResult getProCbx(@RequestBody SelectDto dto){ +// return service.getProCbx(dto); +// } +// +// @ApiOperation(value = "配件所属上级树") +// @PostMapping("getAccessoryTree") +// public AjaxResult getAccessoryTree(){ +// return service.getAccessoryTree(); +// } +// +// @ApiOperation(value = "配件所属上级树") +// @PostMapping("getPartTree") +// public AjaxResult getPartTree(@RequestBody SelectDto dto){ +// return service.getPartTree(dto); +// } +// +// @ApiOperation(value = "货架") +// @PostMapping("getGoodsShelvesCbx") +// public AjaxResult getGoodsShelvesCbx(@RequestBody SelectDto dto){ +// return service.getGoodsShelvesCbx(dto); +// } +// +// @ApiOperation(value = "用户/维修员/库管员/采购员") +// @PostMapping("getUserByRoleIdCbx") +// public AjaxResult getUserByRoleIdCbx(@RequestBody SelectDto dto){ +// return service.getUserByRoleIdCbx(dto); +// } +// +// @ApiOperation(value = "往来单位id和标段工程id获取协议信息") +// @PostMapping("getAgreementInfoById") +// public AjaxResult getAgreementInfoById(@RequestBody SelectDto dto){ +// return service.getAgreementInfoById(dto); +// } +//} From 2b0c9ecbe2837007654044a2042b3fd2f1e1b947 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 19 Aug 2024 13:19:20 +0800 Subject: [PATCH 08/26] move select to material --- .../system/controller/SelectController.java | 126 -------- .../bonus/sgzb/system/domain/SelectDto.java | 34 --- .../bonus/sgzb/system/domain/SelectVo.java | 16 - .../sgzb/system/mapper/SelectMapper.java | 193 ------------ .../sgzb/system/service/SelectService.java | 178 ----------- .../service/impl/SelectServiceImpl.java | 276 ------------------ .../resources/mapper/system/SelectMapper.xml | 218 -------------- 7 files changed, 1041 deletions(-) delete mode 100644 sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java delete mode 100644 sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java delete mode 100644 sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectVo.java delete mode 100644 sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java delete mode 100644 sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java delete mode 100644 sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java delete mode 100644 sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java deleted file mode 100644 index 736c8f6..0000000 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java +++ /dev/null @@ -1,126 +0,0 @@ -//package com.bonus.sgzb.system.controller; -// -//import com.bonus.sgzb.common.core.web.domain.AjaxResult; -//import com.bonus.sgzb.system.domain.SelectDto; -//import com.bonus.sgzb.system.service.SelectService; -//import io.swagger.annotations.ApiOperation; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestBody; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//import javax.annotation.Resource; -// -///** -// * @author 10488 -// * 统一下拉选 -// */ -//@RestController -//@RequestMapping("/select/") -//public class SelectController { -// -// @Resource(name = "SelectService") -// private SelectService service; -// -// @ApiOperation(value = "往来单位下拉选") -// @PostMapping("getUnitCbx") -// public AjaxResult getUnitData(@RequestBody SelectDto dto) { -// return service.getUnitData(dto); -// } -// -// @ApiOperation(value = "工程下拉选") -// @PostMapping("getSectionEngineeringCbx") -// public AjaxResult getProData(@RequestBody SelectDto dto) { -// return service.getProData(dto); -// } -// -// @ApiOperation(value = "机具类型下拉选") -// @PostMapping("getMaTypeData") -// public AjaxResult getMaTypeData(@RequestBody SelectDto dto){ -// return service.getMaTypeData(dto); -// } -// -// @ApiOperation(value = "数据字典下拉选") -// @PostMapping("getDictByPidCbx") -// public AjaxResult getDictByPidCbx(@RequestBody SelectDto dto){ -// return service.getDictByPidCbx(dto); -// } -// -// @ApiOperation(value = "单位树/归属部门/所属上级") -// @PostMapping("getDeptTree") -// public AjaxResult getDeptTree(@RequestBody SelectDto dto){ -// return service.getDeptTree(dto); -// } -// -// @ApiOperation(value = "岗位下拉选") -// @PostMapping("getPostCbx") -// public AjaxResult getPostCbx(@RequestBody SelectDto dto){ -// return service.getPostCbx(dto); -// } -// -// @ApiOperation(value = "角色下拉选") -// @PostMapping("getRoleCbx") -// public AjaxResult getRoleCbx(@RequestBody SelectDto dto){ -// return service.getRoleCbx(dto); -// } -// -// @ApiOperation(value = "单位类型下拉选") -// @PostMapping("getUnitTypeCbx") -// public AjaxResult getUnitTypeCbx(@RequestBody SelectDto dto){ -// return service.getUnitTypeCbx(dto); -// } -// -// @ApiOperation(value = "设备类型树") -// @PostMapping("getDeviceTypeTree") -// public AjaxResult getDeviceTypeTree(@RequestBody SelectDto dto){ -// return service.getDeviceTypeTree(dto); -// } -// -// @ApiOperation(value = "资产属性") -// @PostMapping("getAssetAttributesCbx") -// public AjaxResult getAssetAttributesCbx(@RequestBody SelectDto dto){ -// return service.getAssetAttributesCbx(dto); -// } -// -// @ApiOperation(value = "机具厂家") -// @PostMapping("getDeviceFactoryCbx") -// public AjaxResult getDeviceFactoryCbx(@RequestBody SelectDto dto){ -// return service.getDeviceFactoryCbx(dto); -// } -// -// @ApiOperation(value = "工程项目") -// @PostMapping("getProCbx") -// public AjaxResult getProCbx(@RequestBody SelectDto dto){ -// return service.getProCbx(dto); -// } -// -// @ApiOperation(value = "配件所属上级树") -// @PostMapping("getAccessoryTree") -// public AjaxResult getAccessoryTree(){ -// return service.getAccessoryTree(); -// } -// -// @ApiOperation(value = "配件所属上级树") -// @PostMapping("getPartTree") -// public AjaxResult getPartTree(@RequestBody SelectDto dto){ -// return service.getPartTree(dto); -// } -// -// @ApiOperation(value = "货架") -// @PostMapping("getGoodsShelvesCbx") -// public AjaxResult getGoodsShelvesCbx(@RequestBody SelectDto dto){ -// return service.getGoodsShelvesCbx(dto); -// } -// -// @ApiOperation(value = "用户/维修员/库管员/采购员") -// @PostMapping("getUserByRoleIdCbx") -// public AjaxResult getUserByRoleIdCbx(@RequestBody SelectDto dto){ -// return service.getUserByRoleIdCbx(dto); -// } -// -// @ApiOperation(value = "往来单位id和标段工程id获取协议信息") -// @PostMapping("getAgreementInfoById") -// public AjaxResult getAgreementInfoById(@RequestBody SelectDto dto){ -// return service.getAgreementInfoById(dto); -// } -//} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java deleted file mode 100644 index 400c100..0000000 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.bonus.sgzb.system.domain; - -import lombok.Data; - -import java.util.List; - -/** - * @author 10488 - */ -@Data -public class SelectDto { - - /** 参数id*/ - private String id; - - /** 2.物品种类 3.设备类型 4.规格型号*/ - private String type; - - /** 字典表 父类值*/ - private String parentValue; - - /** 层级*/ - private String level; - - /** 角色权限字符串*/ - private String roleKey; - - /** 往来单位id*/ - private int unitId; - - /** 标段工程id*/ - private int projectId; - -} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectVo.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectVo.java deleted file mode 100644 index 82c7450..0000000 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectVo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.bonus.sgzb.system.domain; - -import lombok.Data; - -/** - * @author 10488 - */ -@Data -public class SelectVo { - - /** id*/ - private long id; - - /** 名称*/ - private String name; -} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java deleted file mode 100644 index 35ffb85..0000000 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.bonus.sgzb.system.mapper; - -import com.bonus.sgzb.system.domain.AgreementVo; -import com.bonus.sgzb.system.domain.SelectDto; -import com.bonus.sgzb.system.domain.SelectVo; -import com.bonus.sgzb.system.domain.TreeNode; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @author 10488 - * 统一下拉选 - */ -@Repository("SelectMapper") -public interface SelectMapper { - /** - * 往来单位下拉选 - * @param dto - * @return List - * @description 往来单位 - * @author cwchen - * @date 2023/12/20 14:23 - */ - List getUnitData(SelectDto dto); - - /** - * 工程下拉选 - * @param dto - * @return List - * @description 工程 - * @author cwchen - * @date 2023/12/20 15:05 - */ - List getProData(SelectDto dto); - - /** - * 机具类型下拉选 - * @param dto - * @return List - * @description 机具类型 - * @author cwchen - * @date 2023/12/20 16:02 - */ - List getMaTypeData(SelectDto dto); - - /** - * 数据字典下拉选 - * @param dto - * @return List - * @description 数据字典下拉选 - * @author cwchen - * @date 2023/12/20 16:23 - */ - List getDictByPidCbx(SelectDto dto); - - /** - * 单位树/归属部门/所属上级 - * @param dto - * @return List - * @description 单位树/归属部门/所属上级 - * @author cwchen - * @date 2023/12/20 17:10 - */ - List getDeptTree(SelectDto dto); - - /** - * 岗位下拉选 - * @param dto - * @return List - * @description 岗位下拉选 - * @author cwchen - * @date 2023/12/20 17:50 - */ - List getPostCbx(SelectDto dto); - - /** - * 角色下拉选 - * @param dto - * @return List - * @description 角色下拉选 - * @author cwchen - * @date 2023/12/20 17:56 - */ - List getRoleCbx(SelectDto dto); - - /** - * 单位类型下拉选 - * @param dto - * @return List - * @description 单位类型下拉选 - * @author cwchen - * @date 2023/12/20 18:01 - */ - List getUnitTypeCbx(SelectDto dto); - - /** - * 设备类型树 - * @param dto - * @return List - * @description 设备类型树 - * @author cwchen - * @date 2023/12/20 18:15 - */ - List getDeviceTypeTree(SelectDto dto); - - /** - * 资产属性 - * @param dto - * @return List - * @description 资产属性 - * @author cwchen - * @date 2023/12/20 19:48 - */ - List getAssetAttributesCbx(SelectDto dto); - - /** - * 机具厂家 - * @param dto - * @return List - * @description 机具厂家 - * @author cwchen - * @date 2023/12/20 19:57 - */ - List getDeviceFactoryCbx(SelectDto dto); - - /** - * 工程项目 - * @param dto - * @return List - * @description 工程项目 - * @author cwchen - * @date 2023/12/20 20:01 - */ - List getProCbx(SelectDto dto); - - /** - * 配件所属上级树 - * @param - * @return List - * @description 配件所属上级树 - * @author cwchen - * @date 2023/12/20 20:26 - */ - List getAccessoryTree(); - - /** - * 货架 - * @param dto - * @return List - * @description 货架 - * @author cwchen - * @date 2023/12/20 20:36 - */ - List getGoodsShelvesCbx(SelectDto dto); - - /** - * 用户/维修员/库管员/采购员-下拉选 - * @param dto - * @return List - * @description 用户/维修员/库管员/采购员-下拉选 - * @author cwchen - * @date 2023/12/20 20:54 - */ - List getUserByRoleIdCbxSelect(SelectDto dto); - - /** - * 用户/维修员/库管员/采购员-树 - * @param dto - * @return List - * @description 用户/维修员/库管员/采购员-树 - * @author cwchen - * @date 2023/12/20 21:02 - */ - List getUserByRoleIdCbxTree(SelectDto dto); - - /** - * 往来单位id和标段工程id获取协议信息 - * @param dto - * @return AgreementVo - * @description 往来单位id和标段工程id获取协议信息 - * @author cwchen - * @date 2023/12/21 10:53 - */ - List getAgreementInfoById(SelectDto dto); - - /** - * 配件所属上级树 - * @param dto - * @return List - */ - List getPartTree(SelectDto dto); -} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java deleted file mode 100644 index 1ad1ec7..0000000 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java +++ /dev/null @@ -1,178 +0,0 @@ -package com.bonus.sgzb.system.service; - -import com.bonus.sgzb.common.core.web.domain.AjaxResult; -import com.bonus.sgzb.system.domain.SelectDto; - -/** - * @author 10488 - * 统一下拉选 - */ -public interface SelectService { - - /** - * 往来单位 - * @param dto - * @return AjaxResult - * @description 往来单位 - * @author cwchen - * @date 2023/12/20 14:20 - */ - AjaxResult getUnitData(SelectDto dto); - - /** - * 工程 - * @param dto - * @return AjaxResult - * @description 工程 - * @author cwchen - * @date 2023/12/20 15:04 - */ - AjaxResult getProData(SelectDto dto); - - /** - * 机具类型 - * @param dto - * @return AjaxResult - * @description 机具类型 - * @author cwchen - * @date 2023/12/20 16:02 - */ - AjaxResult getMaTypeData(SelectDto dto); - - /** - * 数据字典下拉选 - * @param dto - * @return AjaxResult - * @description 数据字典下拉选 - * @author cwchen - * @date 2023/12/20 16:22 - */ - AjaxResult getDictByPidCbx(SelectDto dto); - - /** - * 单位树/归属部门/所属上级 - * @param dto - * @return AjaxResult - * @description 单位树/归属部门/所属上级 - * @author cwchen - * @date 2023/12/20 16:36 - */ - AjaxResult getDeptTree(SelectDto dto); - - /** - * 岗位下拉树 - * @param dto - * @return AjaxResult - * @description 岗位下拉树 - * @author cwchen - * @date 2023/12/20 17:45 - */ - AjaxResult getPostCbx(SelectDto dto); - - /** - * 角色下拉选 - * @param dto - * @return AjaxResult - * @description 角色下拉选 - * @author cwchen - * @date 2023/12/20 17:56 - */ - AjaxResult getRoleCbx(SelectDto dto); - - /** - * 单位类型下拉选 - * @param dto - * @return AjaxResult - * @description 单位类型下拉选 - * @author cwchen - * @date 2023/12/20 18:00 - */ - AjaxResult getUnitTypeCbx(SelectDto dto); - - /** - * 设备类型树 - * @param dto - * @return AjaxResult - * @description 设备类型树 - * @author cwchen - * @date 2023/12/20 18:14 - */ - AjaxResult getDeviceTypeTree(SelectDto dto); - - /** - * 资产属性 - * @param dto - * @return AjaxResult - * @description 资产属性 - * @author cwchen - * @date 2023/12/20 19:47 - */ - AjaxResult getAssetAttributesCbx(SelectDto dto); - - /** - * 机具厂家 - * @param dto - * @return AjaxResult - * @description 机具厂家 - * @author cwchen - * @date 2023/12/20 19:56 - */ - AjaxResult getDeviceFactoryCbx(SelectDto dto); - - /** - * 工程项目 - * @param dto - * @return AjaxResult - * @description 工程项目 - * @author cwchen - * @date 2023/12/20 20:01 - */ - AjaxResult getProCbx(SelectDto dto); - - /** - * 配件所属上级树 - * @param - * @return AjaxResult - * @description 配件所属上级树 - * @author cwchen - * @date 2023/12/20 20:25 - */ - AjaxResult getAccessoryTree(); - - /** - * 货架 - * @param dto - * @return AjaxResult - * @description 货架 - * @author cwchen - * @date 2023/12/20 20:36 - */ - AjaxResult getGoodsShelvesCbx(SelectDto dto); - - /** - * 用户/维修员/库管员/采购员 - * @param dto - * @return AjaxResult - * @description 用户/维修员/库管员/采购员 - * @author cwchen - * @date 2023/12/20 20:48 - */ - AjaxResult getUserByRoleIdCbx(SelectDto dto); - - /** - * 往来单位id和标段工程id获取协议信息 - * @param dto - * @return AjaxResult - * @description 往来单位id和标段工程id获取协议信息 - * @author cwchen - * @date 2023/12/21 10:47 - */ - AjaxResult getAgreementInfoById(SelectDto dto); - - /** - * 配件所属上级树 - * @param dto - * @return AjaxResult - */ - AjaxResult getPartTree(SelectDto dto); -} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java deleted file mode 100644 index 48f4174..0000000 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java +++ /dev/null @@ -1,276 +0,0 @@ -package com.bonus.sgzb.system.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.bonus.sgzb.common.core.utils.GlobalConstants; -import com.bonus.sgzb.common.core.web.domain.AjaxResult; -import com.bonus.sgzb.system.domain.AgreementVo; -import com.bonus.sgzb.system.domain.SelectDto; -import com.bonus.sgzb.system.domain.SelectVo; -import com.bonus.sgzb.system.domain.TreeNode; -import com.bonus.sgzb.system.mapper.SelectMapper; -import com.bonus.sgzb.system.service.SelectService; -import com.bonus.sgzb.system.util.TreeBuild; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -/** - * @author 10488 - * 统一下拉选 - */ -@Service("SelectService") -@Slf4j -public class SelectServiceImpl implements SelectService { - - @Resource(name = "SelectMapper") - private SelectMapper mapper; - - @Override - public AjaxResult getUnitData(SelectDto dto) { - List list = new ArrayList<>(); - try { - list = mapper.getUnitData(dto); - } catch (Exception e) { - log.error("往来单位-查询失败", e); - } - return AjaxResult.success(list); - } - - @Override - public AjaxResult getProData(SelectDto dto) { - try { - List list = mapper.getProData(dto); - list.removeIf(item -> item == null); - return AjaxResult.success(list); - } catch (Exception e) { - log.error("工程-查询失败", e); - } - return AjaxResult.success(); - } - - @Override - public AjaxResult getMaTypeData(SelectDto dto) { - List list = new ArrayList<>(); - try { - list = mapper.getMaTypeData(dto); - } catch (Exception e) { - log.error("机具类型-查询失败", e); - } - return AjaxResult.success(list); - } - - @Override - public AjaxResult getDictByPidCbx(SelectDto dto) { - List list = new ArrayList<>(); - try { - list = mapper.getDictByPidCbx(dto); - } catch (Exception e) { - log.error("数据字典-查询失败", e); - } - return AjaxResult.success(list); - } - - @Override - public AjaxResult getDeptTree(SelectDto dto) { - List groupList = new ArrayList<>(); - List list = new ArrayList<>(); - try { - list = mapper.getDeptTree(dto); - if (CollectionUtils.isNotEmpty(list)) { - // 创建树形结构（数据集合作为参数） - TreeBuild treeBuild = new TreeBuild(list); - // 原查询结果转换树形结构 - groupList = treeBuild.buildTree(); - } - } catch (Exception e) { - log.error("单位树/归属部门/所属上级-查询失败", e); - } - return AjaxResult.success(groupList); - } - - @Override - public AjaxResult getPostCbx(SelectDto dto) { - List list = new ArrayList<>(); - try { - list = mapper.getPostCbx(dto); - } catch (Exception e) { - log.error("岗位下拉选-查询失败", e); - } - return AjaxResult.success(list); - } - - @Override - public AjaxResult getRoleCbx(SelectDto dto) { - List list = new ArrayList<>(); - try { - list = mapper.getRoleCbx(dto); - } catch (Exception e) { - log.error("角色下拉选-查询失败", e); - } - return AjaxResult.success(list); - } - - @Override - public AjaxResult getUnitTypeCbx(SelectDto dto) { - List list = new ArrayList<>(); - try { - list = mapper.getUnitTypeCbx(dto); - } catch (Exception e) { - log.error("单位类型下拉选-查询失败", e); - } - return AjaxResult.success(list); - } - - @Override - public AjaxResult getDeviceTypeTree(SelectDto dto) { - List groupList = new ArrayList<>(); - List list = new ArrayList<>(); - try { - list = mapper.getDeviceTypeTree(dto); - if (CollectionUtils.isNotEmpty(list)) { - // 创建树形结构（数据集合作为参数） - TreeBuild treeBuild = new TreeBuild(list); - // 原查询结果转换树形结构 - groupList = treeBuild.buildTree(); - } - } catch (Exception e) { - log.error("单位树/归属部门/所属上级-查询失败", e); - } - return AjaxResult.success(groupList); - } - - @Override - public AjaxResult getAssetAttributesCbx(SelectDto dto) { - List list = new ArrayList<>(); - try { - list = mapper.getAssetAttributesCbx(dto); - } catch (Exception e) { - log.error("资产属性-查询失败", e); - } - return AjaxResult.success(list); - } - - @Override - public AjaxResult getDeviceFactoryCbx(SelectDto dto) { - List list = new ArrayList<>(); - try { - list = mapper.getDeviceFactoryCbx(dto); - } catch (Exception e) { - log.error("机具厂家-查询失败", e); - } - return AjaxResult.success(list); - } - - @Override - public AjaxResult getProCbx(SelectDto dto) { - List list = new ArrayList<>(); - try { - list = mapper.getProCbx(dto); - } catch (Exception e) { - log.error("工程项目-查询失败", e); - } - return AjaxResult.success(list); - } - - @Override - public AjaxResult getAccessoryTree() { - List groupList = new ArrayList<>(); - List list = new ArrayList<>(); - try { - list = mapper.getAccessoryTree(); - if (CollectionUtils.isNotEmpty(list)) { - // 创建树形结构（数据集合作为参数） - TreeBuild treeBuild = new TreeBuild(list); - // 原查询结果转换树形结构 - groupList = treeBuild.buildTree(); - } - } catch (Exception e) { - log.error("配件所属上级树-查询失败", e); - } - return AjaxResult.success(groupList); - } - - @Override - public AjaxResult getPartTree(SelectDto dto) { - List groupList = new ArrayList<>(); - List list = new ArrayList<>(); - try { - list = mapper.getPartTree(dto); - if (CollectionUtils.isNotEmpty(list)) { - // 创建树形结构（数据集合作为参数） - TreeBuild treeBuild = new TreeBuild(list); - // 原查询结果转换树形结构 - groupList = treeBuild.buildTree(); - } - } catch (Exception e) { - log.error("配件所属上级树-查询失败", e); - } - return AjaxResult.success(groupList); - } - - @Override - public AjaxResult getGoodsShelvesCbx(SelectDto dto) { - List groupList = new ArrayList<>(); - List list = new ArrayList<>(); - try { - list = mapper.getGoodsShelvesCbx(dto); - if (CollectionUtils.isNotEmpty(list)) { - // 创建树形结构（数据集合作为参数） - TreeBuild treeBuild = new TreeBuild(list); - // 原查询结果转换树形结构 - groupList = treeBuild.buildTree(); - } - } catch (Exception e) { - log.error("货架-查询失败", e); - } - return AjaxResult.success(groupList); - } - - @Override - public AjaxResult getUserByRoleIdCbx(SelectDto dto) { - try { - if (Objects.equals(GlobalConstants.STRING_1, dto.getType())) { - // 用户/维修员/库管员/采购员-下拉选 - List list = new ArrayList<>(); - list = mapper.getUserByRoleIdCbxSelect(dto); - return AjaxResult.success(list); - } else if (Objects.equals(GlobalConstants.STRING_2, dto.getType())) { - List groupList = new ArrayList<>(); - List list = new ArrayList<>(); - // 用户/维修员/库管员/采购员-树 - list = mapper.getUserByRoleIdCbxTree(dto); - if (CollectionUtils.isNotEmpty(list)) { - // 创建树形结构（数据集合作为参数） - TreeBuild treeBuild = new TreeBuild(list); - // 原查询结果转换树形结构 - groupList = treeBuild.buildTree(); - } - return AjaxResult.success(groupList); - } - } catch (Exception e) { - log.error("用户/维修员/库管员/采购员-查询失败", e); - } - return AjaxResult.success(null); - } - - @Override - public AjaxResult getAgreementInfoById(SelectDto dto) { - AgreementVo vo = new AgreementVo(); - try { - List list = mapper.getAgreementInfoById(dto); - if (CollectionUtils.isNotEmpty(list)) { - vo = list.get(0); - } - } catch (Exception e) { - log.error("往来单位id和标段工程id获取协议信息", e); - } - return AjaxResult.success(vo); - } - - -} diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml deleted file mode 100644 index a7fb866..0000000 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 474cc5696442bb7a2c94f4d5feb26cb080303946 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 19 Aug 2024 13:20:48 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/app/TmTaskMapper.xml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml index 4403e1a..2e6947c 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml @@ -978,12 +978,27 @@ SELECT lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType, case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName, - mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode + CASE mt.manage_type + WHEN 0 THEN + IFNULL(subquery0.num, 0) + ELSE + IFNULL(mt.num, 0) + END as num, + (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,subquery0.ma_code as maCode FROM lease_apply_details lad LEFT JOIN ma_type mt ON lad.type_id = mt.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id - LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id + LEFT JOIN (SELECT mt.type_id, + mt2.type_name AS typeName, + mt.type_name AS typeModelName, + mm.ma_code, + count(mm.ma_id) num + FROM ma_machine mm + LEFT JOIN ma_type mt ON mt.type_id = mm.type_id + LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + WHERE mm.ma_code is not null and mm.ma_status in (15) + GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt.type_id WHERE lad.parennt_id = #{record.id} GROUP BY From f6e8dd0c5cf971d94e24f279262809d2f587077e Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 19 Aug 2024 13:40:06 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index 46f2946..5907c54 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -291,7 +291,7 @@ public class LogAspect bmStorageLog.setTaskId(String.valueOf(lod.getTaskId())); bmStorageLog.setTypeId(lod.getTypeId()); bmStorageLog.setTypeName(lod.getMaCode()); - bmStorageLog.setPreStoreNum(lod.getNum()); + bmStorageLog.setPreStoreNum(Objects.isNull(lod.getNum()) ? 0 : lod.getNum().intValue()); bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue()); bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); bmStorageLogList.add(bmStorageLog); From 29f45e61036e800d2101e1768b48ecd507031175 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 19 Aug 2024 13:53:44 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java | 2 ++ .../main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java | 4 ++-- .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java index 546fe56..40c2e99 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java @@ -163,6 +163,8 @@ public class LeaseOutDetails implements Serializable { @ApiModelProperty(value = "数量出库 -> 操作前库存量") private Integer num; + /** 操作前库存 */ + private int preStoreNum; /** 操作后库存 */ private int postStoreNum; } \ No newline at end of file diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index 5907c54..debc989 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -291,7 +291,7 @@ public class LogAspect bmStorageLog.setTaskId(String.valueOf(lod.getTaskId())); bmStorageLog.setTypeId(lod.getTypeId()); bmStorageLog.setTypeName(lod.getMaCode()); - bmStorageLog.setPreStoreNum(Objects.isNull(lod.getNum()) ? 0 : lod.getNum().intValue()); + bmStorageLog.setPreStoreNum(lod.getPreStoreNum()); bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue()); bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); bmStorageLogList.add(bmStorageLog); @@ -303,7 +303,7 @@ public class LogAspect bmStorageLog.setTaskId(String.valueOf(lod.getTaskId())); bmStorageLog.setTypeId(lod.getTypeId()); bmStorageLog.setTypeName(lod.getMaCode()); - bmStorageLog.setPreStoreNum(lod.getNum()); + bmStorageLog.setPreStoreNum(lod.getPreStoreNum()); bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue()); bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); bmStorageLogList.add(bmStorageLog); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 85c13fb..32ba8fc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -149,6 +149,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { try { // 1、判断是否重复提交 res = checkRepeatSubmit(record); + record.setPreStoreNum(getStorageNum(record)); if (res > 0) { if ((record.getManageType() == 1 || record.getManageType() == 2) && record.getInputNum() != null) { record.setOutNum(record.getInputNum().doubleValue()); From 25523e3f4b43a5ae2530c54b8e1ee8e392410fc8 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 19 Aug 2024 14:54:28 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/material/BackApplyMapper.xml | 144 ++++++++++++++---- 1 file changed, 112 insertions(+), 32 deletions(-) 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 c50305d..e0a9c7c 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 @@ -571,43 +571,123 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.type_name like concat('%', #{keyWord}, '%')) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT + count(mm.ma_id) + FROM ma_machine mm + LEFT JOIN ma_type mt ON mt.type_id = mm.type_id + LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + WHERE mm.ma_code is not null and mm.ma_status in (15) + AND mt.type_id = #{typeId} + \ No newline at end of file From 4293d5a5622758a6a46f3b63e527befcb939caf1 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 19 Aug 2024 19:18:24 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BA=93=E7=AE=A1=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api}/domain/RepairTestInputDto.java | 2 +- .../bonus/sgzb/common/log/aspect/LogAspect.java | 15 +++++++++++++++ .../controller/RepairTestInputController.java | 5 ++++- .../material/mapper/RepairTestInputMapper.java | 1 + .../material/service/RepairTestInputService.java | 2 +- .../service/impl/RepairTestInputServiceImpl.java | 2 +- 6 files changed, 23 insertions(+), 4 deletions(-) rename {sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material => sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api}/domain/RepairTestInputDto.java (91%) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTestInputDto.java similarity index 91% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java rename to sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTestInputDto.java index b6f3d62..cc24587 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTestInputDto.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.material.domain; +package com.bonus.sgzb.base.api.domain; import lombok.Data; diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index 498fd2e..310a072 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -323,6 +323,21 @@ public class LogAspect bmStorageLog.setPostStoreNum(bai.getPostStoreNum()); bmStorageLogList.add(bmStorageLog); } + // 修试后入库-入库操作 + if (joinPoint.getArgs()[0] instanceof RepairTestInputDto) { + RepairTestInputDto rti = (RepairTestInputDto)joinPoint.getArgs()[0]; + BmStorageLog bmStorageLog = new BmStorageLog(); + bmStorageLog.setTaskId(String.valueOf(rti.getTaskId())); + bmStorageLog.setTypeId(Integer.parseInt(rti.getTypeId())); +// bmStorageLog.setTypeName(rti.getMaCode()); +// bmStorageLog.setPreStoreNum(Integer.parseInt(rti.getNum())); +// bmStorageLog.setBackNum(rti.getBackNum()); +// bmStorageLog.setPassNum(rti.getPassNum()); +// bmStorageLog.setMaintenanceNum(rti.getMaintenanceNum()); +// bmStorageLog.setScrapNum(rti.getScrapNum()); +// bmStorageLog.setPostStoreNum(rti.getPostStoreNum()); + bmStorageLogList.add(bmStorageLog); + } // 二级库出入库, 不影响ma_type库存变化，暂时不加库存监控日志 // if (joinPoint.getArgs()[0] instanceof TeamLeaseInfo) { // TeamLeaseInfo tli = (TeamLeaseInfo)joinPoint.getArgs()[0]; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java index bdd2eb5..cd74888 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java @@ -6,8 +6,9 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.PreventRepeatSubmit; import com.bonus.sgzb.material.domain.RepairTestInputDetailVo; -import com.bonus.sgzb.material.domain.RepairTestInputDto; +import com.bonus.sgzb.base.api.domain.RepairTestInputDto; import com.bonus.sgzb.material.domain.RepairTestInputVo; import com.bonus.sgzb.material.service.RepairTestInputService; import io.swagger.annotations.ApiOperation; @@ -60,6 +61,8 @@ public class RepairTestInputController extends BaseController { } @ApiOperation(value = "修试后入库-入库操作") + @PreventRepeatSubmit + @Log(title = "修试后入库-入库操作", businessType = BusinessType.MATERIAL) @PostMapping("inputByType") public AjaxResult inputByType(@RequestBody RepairTestInputDto dto){ return service.inputByType(dto); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java index bcf0968..297bb64 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.material.mapper; +import com.bonus.sgzb.base.api.domain.RepairTestInputDto; import com.bonus.sgzb.material.domain.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java index f1fd24f..d5b76ea 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java @@ -2,7 +2,7 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.RepairTestInputDetailVo; -import com.bonus.sgzb.material.domain.RepairTestInputDto; +import com.bonus.sgzb.base.api.domain.RepairTestInputDto; import com.bonus.sgzb.material.domain.RepairTestInputVo; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java index 313f6e6..69bb3b6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.service.impl; import com.alibaba.fastjson.JSONObject; +import com.bonus.sgzb.base.api.domain.RepairTestInputDto; import com.bonus.sgzb.common.core.constant.HttpStatus; import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.utils.DateTimeHelper; @@ -15,7 +16,6 @@ import com.bonus.sgzb.material.mapper.RepairTestInputMapper; import com.bonus.sgzb.material.mapper.TaskMapper; import com.bonus.sgzb.material.mapper.TmTaskAgreementMapper; import com.bonus.sgzb.material.service.RepairTestInputService; -import com.bonus.sgzb.material.vo.GlobalContants; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; From ae2837fed9d5a96c0347ea48aae69e274999ec66 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 19 Aug 2024 19:48:02 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BA=93=E7=AE=A1=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api/domain/RepairTestInputDto.java | 9 +++++++++ .../bonus/sgzb/common/log/aspect/LogAspect.java | 10 +++------- .../material/mapper/RepairTestInputMapper.java | 2 ++ .../service/impl/RepairTestInputServiceImpl.java | 14 ++++++++++++++ .../mapper/material/RepairTestInputMapper.xml | 9 +++++++++ 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTestInputDto.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTestInputDto.java index cc24587..eb01bd1 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTestInputDto.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTestInputDto.java @@ -29,4 +29,13 @@ public class RepairTestInputDto{ private String params; + /** 维修数量 */ + private int repairNum; + + /** 操作前库存 */ + private int preStoreNum; + + /** 操作后库存 */ + private int postStoreNum; + } diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index 310a072..5e4105c 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -329,13 +329,9 @@ public class LogAspect BmStorageLog bmStorageLog = new BmStorageLog(); bmStorageLog.setTaskId(String.valueOf(rti.getTaskId())); bmStorageLog.setTypeId(Integer.parseInt(rti.getTypeId())); -// bmStorageLog.setTypeName(rti.getMaCode()); -// bmStorageLog.setPreStoreNum(Integer.parseInt(rti.getNum())); -// bmStorageLog.setBackNum(rti.getBackNum()); -// bmStorageLog.setPassNum(rti.getPassNum()); -// bmStorageLog.setMaintenanceNum(rti.getMaintenanceNum()); -// bmStorageLog.setScrapNum(rti.getScrapNum()); -// bmStorageLog.setPostStoreNum(rti.getPostStoreNum()); + bmStorageLog.setPreStoreNum(rti.getPreStoreNum()); + bmStorageLog.setInNum(rti.getRepairNum()); + bmStorageLog.setPostStoreNum(rti.getPostStoreNum()); bmStorageLogList.add(bmStorageLog); } // 二级库出入库, 不影响ma_type库存变化，暂时不加库存监控日志 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java index 297bb64..fd03737 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java @@ -122,4 +122,6 @@ public interface RepairTestInputMapper { List exportList(RepairTestInputDto bean); int addRepaieAudit(RepairAuditDetails bean); + + int getCountOfMachineByTypeId(String typeId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java index 69bb3b6..a751a61 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java @@ -114,11 +114,25 @@ public class RepairTestInputServiceImpl implements RepairTestInputService { String repairNum = StringUtils.isNotEmpty(dto.getRepairNum()) ? dto.getRepairNum() : "0"; double num = countNum(map.get("num"), repairNum); mapper.updateMaTypeNum(dto.getTypeId(), num); + int codeMachinePreStoreNum = 0; if (Objects.equals("0", dto.getType())) { + codeMachinePreStoreNum = mapper.getCountOfMachineByTypeId(dto.getTypeId()); // 查询机具状态-在库的id、管理方式为编号的需更新机具设备的机具状态 int dicId = mapper.getDicByMaStatusId("ma_status", "在库"); mapper.updateMaMachineStatus(dicId, dto.getMaId()); } + try { + repairTestInputDto.setRepairNum(Integer.parseInt(repairNum)); + if (Objects.equals("0", dto.getType())) { + repairTestInputDto.setPreStoreNum(codeMachinePreStoreNum); + repairTestInputDto.setPostStoreNum(mapper.getCountOfMachineByTypeId(dto.getTypeId())); + } else { + repairTestInputDto.setPreStoreNum((Integer) map.get("num")); + repairTestInputDto.setPostStoreNum((int) num); + } + } catch (Exception e) { + log.error("修试后入库-入库操作-获取库存日志失败", e); + } } } RepairTestWarehousingDto dto = list.get(0); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml index d58158f..2bb3c4a 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml @@ -259,4 +259,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" values (#{taskId},#{repairId},#{maId},#{typeId},#{repairNum},#{repairedNum},#{scrapNum},#{status},#{createBy},now(),#{updateBy},now(),#{companyId}); + \ No newline at end of file From b2b1a25822eb76a9da69a7e6a85b297aa13f5dd1 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 20 Aug 2024 09:48:44 +0800 Subject: [PATCH 16/26] fix issue --- .../src/main/resources/mapper/app/LeaseOutDetailsMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 506e720..694e503 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/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(); From 7e9edd003edd984a0320b7d6cd236a76053869b6 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 20 Aug 2024 09:50:56 +0800 Subject: [PATCH 17/26] fix issue --- .../material/service/impl/RepairTestInputServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java index a751a61..80d13e0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java @@ -127,8 +127,8 @@ public class RepairTestInputServiceImpl implements RepairTestInputService { repairTestInputDto.setPreStoreNum(codeMachinePreStoreNum); repairTestInputDto.setPostStoreNum(mapper.getCountOfMachineByTypeId(dto.getTypeId())); } else { - repairTestInputDto.setPreStoreNum((Integer) map.get("num")); - repairTestInputDto.setPostStoreNum((int) num); +// repairTestInputDto.setPreStoreNum((Integer) map.get("num")); +// repairTestInputDto.setPostStoreNum((int) num); } } catch (Exception e) { log.error("修试后入库-入库操作-获取库存日志失败", e); From 41a39c28ff4108216837b30edebae4de43641c7e Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 20 Aug 2024 10:17:41 +0800 Subject: [PATCH 18/26] fix issue --- .../app/service/impl/LeaseOutDetailsServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 32ba8fc..50cac1a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -279,8 +279,15 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { //判断(ma_type 设备规格表)中的库存够不够出库的 MaType maType = leaseOutDetailsMapper.selectByTypeId(record); if (maType != null) { - if (maType.getNum() == null || maType.getNum().compareTo(BigDecimal.valueOf(record.getOutNum())) < 0) { - return 0; + if ("0".equals(maType.getManageType())) { + int count = leaseOutDetailsMapper.getCountOfCodeMachine(record); + if (BigDecimal.valueOf(count).compareTo(BigDecimal.valueOf(record.getOutNum())) < 0) { + return 0; + } + } else if ("1".equals(maType.getManageType())) { + if (maType.getNum() == null || maType.getNum().compareTo(BigDecimal.valueOf(record.getOutNum())) < 0) { + return 0; + } } } return 1; From d98763456c740a7d56d65eed1aa8b01c7cd59e8c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 20 Aug 2024 10:20:55 +0800 Subject: [PATCH 19/26] fix issue --- .../bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 50cac1a..5c9292c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -204,7 +204,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { if (maType != null) { if ("1".equals(maType.getManageType())) { return maType.getNum().intValue(); - } else { + } else if ("0".equals(maType.getManageType())) { return leaseOutDetailsMapper.getCountOfCodeMachine(record); } } From a71b69eefd2427955a9e99da864e117052213c82 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 20 Aug 2024 13:14:40 +0800 Subject: [PATCH 20/26] fix issue --- .../service/impl/RepairTestInputServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java index 80d13e0..e407c82 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java @@ -122,14 +122,16 @@ public class RepairTestInputServiceImpl implements RepairTestInputService { mapper.updateMaMachineStatus(dicId, dto.getMaId()); } try { - repairTestInputDto.setRepairNum(Integer.parseInt(repairNum)); if (Objects.equals("0", dto.getType())) { repairTestInputDto.setPreStoreNum(codeMachinePreStoreNum); + repairTestInputDto.setRepairNum(Integer.parseInt(repairNum)); repairTestInputDto.setPostStoreNum(mapper.getCountOfMachineByTypeId(dto.getTypeId())); - } else { -// repairTestInputDto.setPreStoreNum((Integer) map.get("num")); -// repairTestInputDto.setPostStoreNum((int) num); } +// else if (Objects.equals("1", dto.getType())) { +// repairTestInputDto.setPreStoreNum((Integer) map.get("num")); +// repairTestInputDto.setRepairNum(Integer.parseInt(repairNum)); +// repairTestInputDto.setPostStoreNum((int) num); +// } } catch (Exception e) { log.error("修试后入库-入库操作-获取库存日志失败", e); } From b3af31388b2da7735a8f69ef978d5a65f02a7617 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 20 Aug 2024 14:56:05 +0800 Subject: [PATCH 21/26] fix issue --- .../material/service/impl/RepairTestInputServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java index e407c82..bb09357 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java @@ -118,8 +118,8 @@ public class RepairTestInputServiceImpl implements RepairTestInputService { if (Objects.equals("0", dto.getType())) { codeMachinePreStoreNum = mapper.getCountOfMachineByTypeId(dto.getTypeId()); // 查询机具状态-在库的id、管理方式为编号的需更新机具设备的机具状态 - int dicId = mapper.getDicByMaStatusId("ma_status", "在库"); - mapper.updateMaMachineStatus(dicId, dto.getMaId()); + //int dicId = mapper.getDicByMaStatusId("ma_status", "在库"); + mapper.updateMaMachineStatus(15, dto.getMaId()); } try { if (Objects.equals("0", dto.getType())) { From 98afd41e1807674d72b5909758134136b0bb4c61 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 20 Aug 2024 15:41:12 +0800 Subject: [PATCH 22/26] fix issue --- .../sgzb/common/log/aspect/LogAspect.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index 5e4105c..421e1a5 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -323,17 +323,17 @@ public class LogAspect bmStorageLog.setPostStoreNum(bai.getPostStoreNum()); bmStorageLogList.add(bmStorageLog); } - // 修试后入库-入库操作 - if (joinPoint.getArgs()[0] instanceof RepairTestInputDto) { - RepairTestInputDto rti = (RepairTestInputDto)joinPoint.getArgs()[0]; - BmStorageLog bmStorageLog = new BmStorageLog(); - bmStorageLog.setTaskId(String.valueOf(rti.getTaskId())); - bmStorageLog.setTypeId(Integer.parseInt(rti.getTypeId())); - bmStorageLog.setPreStoreNum(rti.getPreStoreNum()); - bmStorageLog.setInNum(rti.getRepairNum()); - bmStorageLog.setPostStoreNum(rti.getPostStoreNum()); - bmStorageLogList.add(bmStorageLog); - } + // 修试后入库-入库操作, 因数据类型问题暂停，等更新过数据类型后再放开 +// if (joinPoint.getArgs()[0] instanceof RepairTestInputDto) { +// RepairTestInputDto rti = (RepairTestInputDto)joinPoint.getArgs()[0]; +// BmStorageLog bmStorageLog = new BmStorageLog(); +// bmStorageLog.setTaskId(String.valueOf(rti.getTaskId())); +// bmStorageLog.setTypeId(Integer.parseInt(rti.getTypeId())); +// bmStorageLog.setPreStoreNum(rti.getPreStoreNum()); +// bmStorageLog.setInNum(rti.getRepairNum()); +// bmStorageLog.setPostStoreNum(rti.getPostStoreNum()); +// bmStorageLogList.add(bmStorageLog); +// } // 二级库出入库, 不影响ma_type库存变化，暂时不加库存监控日志 // if (joinPoint.getArgs()[0] instanceof TeamLeaseInfo) { // TeamLeaseInfo tli = (TeamLeaseInfo)joinPoint.getArgs()[0]; From 1acc30f41063bcac46e8f7830f69a1b51b5b92dc Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 20 Aug 2024 15:41:44 +0800 Subject: [PATCH 23/26] fix issue --- .../impl/RepairTestInputServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java index bb09357..3770926 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java @@ -121,20 +121,20 @@ public class RepairTestInputServiceImpl implements RepairTestInputService { //int dicId = mapper.getDicByMaStatusId("ma_status", "在库"); mapper.updateMaMachineStatus(15, dto.getMaId()); } - try { - if (Objects.equals("0", dto.getType())) { - repairTestInputDto.setPreStoreNum(codeMachinePreStoreNum); - repairTestInputDto.setRepairNum(Integer.parseInt(repairNum)); - repairTestInputDto.setPostStoreNum(mapper.getCountOfMachineByTypeId(dto.getTypeId())); - } +// try { +// if (Objects.equals("0", dto.getType())) { +// repairTestInputDto.setPreStoreNum(codeMachinePreStoreNum); +// repairTestInputDto.setRepairNum(Integer.parseInt(repairNum)); +// repairTestInputDto.setPostStoreNum(mapper.getCountOfMachineByTypeId(dto.getTypeId())); +// } // else if (Objects.equals("1", dto.getType())) { // repairTestInputDto.setPreStoreNum((Integer) map.get("num")); // repairTestInputDto.setRepairNum(Integer.parseInt(repairNum)); // repairTestInputDto.setPostStoreNum((int) num); // } - } catch (Exception e) { - log.error("修试后入库-入库操作-获取库存日志失败", e); - } +// } catch (Exception e) { +// log.error("修试后入库-入库操作-获取库存日志失败", e); +// } } } RepairTestWarehousingDto dto = list.get(0); From d2ed1ceec888a5d107977c126682f80434c2ba54 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 20 Aug 2024 15:42:25 +0800 Subject: [PATCH 24/26] fix issue --- .../sgzb/material/controller/RepairTestInputController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java index cd74888..0a65d02 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java @@ -62,7 +62,7 @@ public class RepairTestInputController extends BaseController { @ApiOperation(value = "修试后入库-入库操作") @PreventRepeatSubmit - @Log(title = "修试后入库-入库操作", businessType = BusinessType.MATERIAL) + //@Log(title = "修试后入库-入库操作", businessType = BusinessType.MATERIAL) @PostMapping("inputByType") public AjaxResult inputByType(@RequestBody RepairTestInputDto dto){ return service.inputByType(dto); From a423e5edacb99bedcc6b24b36a9345d84b01ff8c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 20 Aug 2024 15:43:39 +0800 Subject: [PATCH 25/26] fix issue --- .../sgzb/common/log/aspect/LogAspect.java | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index 421e1a5..3580a31 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -349,24 +349,6 @@ public class LogAspect } } - /** - * 获取注解中对方法的描述信息 用于Controller层注解 - * - * @param log 日志 - * @param materialLog 物资日志 - * @throws Exception - */ -// public void getControllerMethodDescriptionByMaterial(JoinPoint joinPoint, Log log, BmNumLogs materialLog, Object jsonResult) throws Exception -// { -// // 设置标题 -// materialLog.setModelTitle(log.title()); -// // 获取参数的信息，传入到数据库中。 -// setRequestValue(joinPoint, materialLog, log.excludeParamNames()); -// // 保存response，参数和值 -// if (StringUtils.isNotNull(jsonResult)) { -// materialLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000)); -// } -// } /** * 获取请求的参数，放到log中 @@ -387,42 +369,6 @@ public class LogAspect } } - /** - * 获取请求的参数，放到log中 - * - * @param numLog 物资日志 - * @throws Exception 异常 - */ -// private void setRequestValue(JoinPoint joinPoint, BmNumLogs numLog, String[] excludeParamNames) throws Exception { -// String requestMethod = numLog.getRequestMethod(); -// Map paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest()); -// if (StringUtils.isEmpty(paramsMap)) { -// if ((HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))){ -// String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames); -// numLog.setDescription(StringUtils.substring(params, 0, 2000)); -// } -// } else { -// if (paramsMap.containsKey("num")) { -// if (paramsMap.get("num") instanceof Integer) { -// numLog.setNum(String.valueOf(paramsMap.get("num"))); -// } else if (paramsMap.get("num") instanceof String) { -// numLog.setNum((String) paramsMap.get("num")); -// } -// } -// if (paramsMap.containsKey("taskId")) { -// numLog.setTask(String.valueOf(paramsMap.get("taskId"))); -// } -// if (paramsMap.containsKey("typeId")) { -// if (paramsMap.get("typeId") instanceof Integer) { -// numLog.setTypeId((Integer) paramsMap.get("typeId")); -// } else if (paramsMap.get("typeId") instanceof String) { -// numLog.setTypeId(Integer.valueOf((String) paramsMap.get("typeId"))); -// } -// } -// numLog.setDescription(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, 2000)); -// } -// } - /** * 参数拼装 */ From 853af3721b0f442454dfb0fb5d3714f522f06c2b Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 21 Aug 2024 19:35:57 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/base/service/impl/RepairServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 78d8a91..6055677 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -154,6 +154,9 @@ public class RepairServiceImpl implements RepairService { if (!"0".equals(sfCosts.toString())) { mapper.addRepairCost(bean, sfCosts, sfPart); } + } else { + // 新增预报废记录 + mapper.addRecord(bean); } return AjaxResult.success(); }