diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml index 10af974e..95925ce6 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml @@ -102,6 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mhs.house_id = #{houseId} + + AND (mt.type_name like concat('%', #{houseName}, '%') or + mt1.type_name like concat('%', #{houseName}, '%') or + mt2.type_name like concat('%', #{houseName}, '%')) + AND mhs.type_id = #{typeId} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java index b1d1e7b0..1513bde0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java @@ -44,14 +44,16 @@ public class PurchaseCheckInfoController extends BaseController @ApiOperation("查询新购入库任务列表") @GetMapping("/putInList") public TableDataInfo putInList(PurchaseCheckInfo purchaseCheckInfo) { - startPage(); List list = new ArrayList<>(); //判断该组织是否开启综合服务中心审核 Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); int re = purchaseCheckServiceCenterService.selectExamineType(companyId); if (re > 0) { + //若依框架多个查询会导致分页失效，需分批处理 + startPage(); list = purchaseCheckInfoService.selectPutInListExamine(purchaseCheckInfo); }else { + startPage(); list = purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo); } return getDataTable(list); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementDto.java index 5146bab5..1f611040 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementDto.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementDto.java @@ -25,6 +25,18 @@ public class PlanManagementDto { @ApiModelProperty(value = "计划ID") private Integer planId; + /** 借调计划ID */ + @ApiModelProperty(value = "借调计划ID") + private Long borrowId; + + /** 需求单位ID */ + @ApiModelProperty(value = "需求单位ID") + private Integer needUnitId; + + /** 借出单位ID */ + @ApiModelProperty(value = "借出单位ID") + private Integer borrowUnitId; + /** 备注 */ @ApiModelProperty(value = "备注") private String remark; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanManagementMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanManagementMapper.xml index 99cd5bd2..1ec1c76f 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanManagementMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanManagementMapper.xml @@ -66,7 +66,8 @@ WHERE 1=1 - and (bu.unit_name like concat('%', #{name}, '%') or + and (bu.unit_id = #{name} or + bu.unit_name like concat('%', #{name}, '%') or mt2.type_name like concat('%',#{name},'%') or mt.type_name like concat('%',#{name},'%')) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index d5e8f0b8..2a572e28 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -409,6 +409,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pmi.fix_code fixCode, pcd.type_id typeId, pcd.task_id taskId, + pcd.remark remark, mt.CODE specsCode, mt.unit_name unitName, mt1.CODE typeCode, 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 d9d67f96..e6435cf4 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 @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) b - INSTR(b.typeId2,#{deviceTypeId}) > 0 + b.typeId2 = #{deviceTypeId} AND b.wxTime BETWEEN CONCAT(#{wxTime},' 00:00:00') AND CONCAT(#{wxTime},' 23:59:59') diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js index 1e208c64..c14167a2 100644 --- a/sgzb-ui/src/api/claimAndRefund/receive.js +++ b/sgzb-ui/src/api/claimAndRefund/receive.js @@ -282,6 +282,14 @@ export function submitNumOut(params){ }) } +// 当前在用量 +export function getUseNumByTypeId(params){ + return request({ + url: '/material/backApply/getUseNumByTypeId', + method: 'get', + params + }) +} diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue index a077705e..d99a4f02 100644 --- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue @@ -169,7 +169,7 @@ export default { // }, { id:31, - name:'机具分公司审核', + name:'分管部门审核', remarkKey:'deptAuditRemark', authorKey:'deptAuditBy', timeKey:'deptAuditTime' diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue index 7cbd9f81..56a2a6e5 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue @@ -233,7 +233,8 @@ import { getDeviceTypeTree, getAgreementInfoById, submitLeaseApply, - getUseTypeTreee + getUseTypeTreee, + getUseNumByTypeId } from '@/api/claimAndRefund/receive' import { ApiSubmitBackApply } from "@/api/claimAndRefund/return" import { submitBackApplyApi,materialReturnNoteByApply,submitRefuseBackApply } from "@/api/claimAndRefund/return.js" @@ -342,6 +343,7 @@ export default { typeName: '', //显示的设备类型 typeCode: '', //显示的设备规格 unitNames: '', //显示的设备 单位 + useNum: '', //当前在用量 remark: '', //单条备注 preNum: 1, //预领数量 }, @@ -762,11 +764,13 @@ export default { }, /////// 设备类型树 切换 - deviceTypeChange(val) { + async deviceTypeChange(val) { let nodes = null; console.log("vall1211221122", this.$refs.deviceTypeCascader.getCheckedNodes().length, this.$refs.deviceTypeCascader.getCheckedNodes(), [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]) nodes = this.$refs.deviceTypeCascader.getCheckedNodes().length > 0 ? this.$refs.deviceTypeCascader.getCheckedNodes() : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)] console.log("nodes", nodes) + const res = await getUseNumByTypeId({ typeId: nodes[0].data.typeId }) + nodes[0].data.useNum = res.data if (nodes[0].level != 4) { return } @@ -790,6 +794,7 @@ export default { template.preNum = node.data.num template.typeName = node.pathLabels[2] template.typeCode = node.pathLabels[3] + template.useNum = node.data.useNum return template } } diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue index 1d8b154d..07897bc9 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue @@ -233,7 +233,8 @@ import { getDeviceTypeTree, getAgreementInfoById, submitLeaseApply, - getUseTypeTreee + getUseTypeTreee, + getUseNumByTypeId } from '@/api/claimAndRefund/receive' import { submitBackApplyApi } from "@/api/claimAndRefund/return" import { submitBackApplyApiByCq,materialReturnNoteByApply,submitRefuseBackApply } from "@/api/claimAndRefund/return.js" @@ -342,6 +343,7 @@ export default { typeName: '', //显示的设备类型 typeCode: '', //显示的设备规格 unitNames: '', //显示的设备 单位 + useNum: '', //当前在用量 remark: '', //单条备注 preNum: 1, //预领数量 }, @@ -762,11 +764,13 @@ export default { }, /////// 设备类型树 切换 - deviceTypeChange(val) { + async deviceTypeChange(val) { let nodes = null; console.log("vall1211221122", this.$refs.deviceTypeCascader.getCheckedNodes().length, this.$refs.deviceTypeCascader.getCheckedNodes(), [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]) nodes = this.$refs.deviceTypeCascader.getCheckedNodes().length > 0 ? this.$refs.deviceTypeCascader.getCheckedNodes() : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)] console.log("nodes", nodes) + const res = await getUseNumByTypeId({ typeId: nodes[0].data.typeId }) + nodes[0].data.useNum = res.data if (nodes[0].level != 4) { return } @@ -790,6 +794,7 @@ export default { template.preNum = node.data.num template.typeName = node.pathLabels[2] template.typeCode = node.pathLabels[3] + template.useNum = node.data.useNum return template } }