Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
This commit is contained in:
BianLzhaoMin
commit
04553ab094
|
|
@ -92,19 +92,20 @@ public class TmTaskServiceImpl implements TmTaskService {
|
|||
// 再审核领料任务信息表
|
||||
List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList();
|
||||
if (CollUtil.isNotEmpty(leaseApplyInfoList)) {
|
||||
Integer companyId1 = leaseApplyInfoList.get(0).getCompanyId();
|
||||
List<LeaseApplyInfo> applyInfoList = new ArrayList<>();
|
||||
if (companyId1 != null && companyId1 == 101) {
|
||||
applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(101)).collect(Collectors.toList());
|
||||
} else if (companyId1 != null && companyId1 == 102) {
|
||||
applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(102)).collect(Collectors.toList());
|
||||
}
|
||||
if (CollUtil.isNotEmpty(applyInfoList)) {
|
||||
for (LeaseApplyInfo leaseApplyInfo : applyInfoList) {
|
||||
taskId = leaseApplyInfo.getTaskId();
|
||||
if (leaseApplyInfo != null) {
|
||||
for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
|
||||
Integer companyId1 = leaseApplyInfo.getCompanyId();
|
||||
List<LeaseApplyInfo> applyInfoList = new ArrayList<>();
|
||||
if (companyId1 != null && companyId1 == 101) {
|
||||
applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(101)).collect(Collectors.toList());
|
||||
} else if (companyId1 != null && companyId1 == 102) {
|
||||
applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(102)).collect(Collectors.toList());
|
||||
}
|
||||
if (CollUtil.isNotEmpty(applyInfoList)) {
|
||||
for (LeaseApplyInfo applyInfo : applyInfoList) {
|
||||
taskId = applyInfo.getTaskId();
|
||||
//leaseApplyInfo.setExamineStatusId(record.getExamineStatusId());
|
||||
result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo);
|
||||
result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(applyInfo);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -138,19 +139,19 @@ public class TmTaskServiceImpl implements TmTaskService {
|
|||
// 再审核领料任务信息表
|
||||
List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList();
|
||||
if (CollUtil.isNotEmpty(leaseApplyInfoList)) {
|
||||
Integer companyId1 = leaseApplyInfoList.get(0).getCompanyId();
|
||||
List<LeaseApplyInfo> applyInfoList = new ArrayList<>();
|
||||
if (companyId1 != null && companyId1 == 101) {
|
||||
applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(101)).collect(Collectors.toList());
|
||||
} else if (companyId1 != null && companyId1 == 102) {
|
||||
applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(102)).collect(Collectors.toList());
|
||||
}
|
||||
if (CollUtil.isNotEmpty(applyInfoList)) {
|
||||
for (LeaseApplyInfo leaseApplyInfo : applyInfoList) {
|
||||
taskId = leaseApplyInfo.getTaskId();
|
||||
if (leaseApplyInfo != null) {
|
||||
for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
|
||||
Integer companyId1 = leaseApplyInfo.getCompanyId();
|
||||
List<LeaseApplyInfo> applyInfoList = new ArrayList<>();
|
||||
if (companyId1 != null && companyId1 == 101) {
|
||||
applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(101)).collect(Collectors.toList());
|
||||
} else if (companyId1 != null && companyId1 == 102) {
|
||||
applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(102)).collect(Collectors.toList());
|
||||
}
|
||||
if (CollUtil.isNotEmpty(applyInfoList)) {
|
||||
for (LeaseApplyInfo applyInfo : applyInfoList) {
|
||||
taskId = applyInfo.getTaskId();
|
||||
//leaseApplyInfo.setExamineStatusId(record.getExamineStatusId());
|
||||
result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo);
|
||||
result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(applyInfo);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
|
|||
taskCode = purchaseCodeRule(TaskTypeConstants.YBF, TaskTypeEnum.REPAIR_TO_BE_SCRAPPED.getCode());
|
||||
/*taskStatus = 58;
|
||||
taskType = 57;*/
|
||||
//创建报废任务
|
||||
//创建待报废任务
|
||||
long scrapTaskId = genTask(taskCode, TaskTypeEnum.REPAIR_TO_BE_SCRAPPED.getCode(), Integer.parseInt(TaskStatusEnum.PENDING_REVIEW.getCode()), tmTaskAgreement, companyId);
|
||||
for (RepairAuditDetails scrapDetails : scrapNumList) {
|
||||
RepairAuditDetails byRepairId = scrapApplyDetailsMapper.getByRepairId(String.valueOf(scrapDetails.getRepairId()));
|
||||
|
|
|
|||
|
|
@ -59,6 +59,14 @@ public class ScrapApplyDetailsVO {
|
|||
*/
|
||||
@Excel(name = "维修单号",sort = 6)
|
||||
private String repairNum;
|
||||
/**
|
||||
* 单位id
|
||||
*/
|
||||
private String unitId;
|
||||
/**
|
||||
* 工程id
|
||||
*/
|
||||
private String projectId;
|
||||
|
||||
/**
|
||||
* 审核状态
|
||||
|
|
|
|||
|
|
@ -428,7 +428,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
tk.CODE scrapNum,
|
||||
tk.task_status taskStatus,
|
||||
dic.NAME taskStatusName,
|
||||
bui.unit_id unitId,
|
||||
bui.unit_name unitName,
|
||||
bpl.lot_id projectId,
|
||||
bpl.lot_name projectName,
|
||||
su.nick_name createBy,
|
||||
tk.create_time createTime,
|
||||
|
|
@ -447,8 +449,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
LEFT JOIN scrap_apply_details sad ON tk.task_id = sad.task_id
|
||||
LEFT JOIN repair_audit_details rad ON sad.parent_id = rad.id
|
||||
LEFT JOIN back_apply_info rad3 ON sad.parent_id = rad3.id
|
||||
LEFT JOIN repair_apply_details rad2 ON rad.repair_id = rad2.id
|
||||
LEFT JOIN tm_task tk1 ON rad2.task_id = tk1.task_id
|
||||
LEFT JOIN tm_task tk1 ON rad.task_id = tk1.task_id
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
id,
|
||||
|
|
@ -464,18 +465,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
WHERE
|
||||
sad.scrap_source IN ( '1', '2' )
|
||||
AND tk.task_type IN ('20' , '21')
|
||||
<if test="keyword != null and keyword != ''">
|
||||
AND (locate(#{keyword}, tk.create_by) > 0
|
||||
or locate(#{keyword}, tk.CODE) > 0
|
||||
or locate(#{keyword}, bui.unit_name) > 0
|
||||
or locate(#{keyword}, bpl.lot_name) > 0
|
||||
or locate(#{keyword}, tk1.CODE) > 0)
|
||||
<if test="keywords != null and keywords != ''">
|
||||
AND (locate(#{keywords}, tk.create_by) > 0
|
||||
or locate(#{keywords}, tk.CODE) > 0
|
||||
or locate(#{keywords}, bui.unit_name) > 0
|
||||
or locate(#{keywords}, bpl.lot_name) > 0
|
||||
or locate(#{keywords}, tk1.CODE) > 0)
|
||||
</if>
|
||||
<if test="backUnit != null and backUnit != ''">
|
||||
and bui.unit_id = #{backUnit}
|
||||
</if>
|
||||
<if test="repairStatus != null and repairStatus != ''">
|
||||
and tk.task_status = #{repairStatus}
|
||||
<if test="taskStatus != null and taskStatus != ''">
|
||||
and tk.task_status = #{taskStatus}
|
||||
</if>
|
||||
<if test="taskIdList != null and taskIdList != ''">
|
||||
and tk.task_id in #{taskIdList}
|
||||
|
|
@ -483,14 +484,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="backPro != null and backPro != ''">
|
||||
and bpl.lot_id = #{backPro}
|
||||
</if>
|
||||
<if test="scrapSource != null and scrapSource != ''">
|
||||
and sad.scrap_source = #{scrapSource}
|
||||
</if>
|
||||
<if test="type != null and type != ''">
|
||||
and mt1.type_id = #{type}
|
||||
</if>
|
||||
<if test="backCode != null and backCode != ''">
|
||||
and locate(#{backCode}, tk.code) > 0
|
||||
</if>
|
||||
<if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''">
|
||||
and tk.create_time between #{params.beginTime} and #{params.endTime}
|
||||
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
|
||||
and DATE(tk.create_time) between #{beginTime} and #{endTime}
|
||||
</if>
|
||||
GROUP BY tk.CODE
|
||||
order by tk.create_time desc
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<div class="box1-item_two">
|
||||
<div>
|
||||
<div class="box_header_div">
|
||||
<div class="box_list" v-for="(item, index) of newArr" :key="index" @click="handleClickItem">
|
||||
<div class="box_list" v-for="(item, index) of newArr" :key="index" @click="handleClickItem(index)">
|
||||
<div class="item-value">
|
||||
{{ item.value }}
|
||||
</div>
|
||||
|
|
@ -48,7 +48,7 @@ export default {
|
|||
isCollapse: false,
|
||||
newArrOne: [
|
||||
{ name: '施工机具总保有量', value: 9999 },
|
||||
// { url: GROUP, name: '工器具总保有量', value: 9999 },
|
||||
{ url: GROUP, name: '工器具总保有量', value: 9999 },
|
||||
],
|
||||
newArr: [
|
||||
{ url: GROUP, name: '在库机具', value: 999 },
|
||||
|
|
@ -62,7 +62,6 @@ export default {
|
|||
{ url: GROUP, name: '报废机具', value: 999 },
|
||||
{ url: GROUP, name: '报废机具', value: 999 },
|
||||
],
|
||||
maType: 1
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -73,12 +72,6 @@ export default {
|
|||
setInterval(() => {
|
||||
this.getTotalOwnershipApiPage()
|
||||
}, 60 * 1000);
|
||||
this.$eventBus.$on('maType', (maType) => {
|
||||
this.maType = maType
|
||||
});
|
||||
},
|
||||
destroyed() {
|
||||
this.$eventBus.$off('maType');
|
||||
},
|
||||
methods: {
|
||||
getTotalOwnershipApiPage() {
|
||||
|
|
@ -116,10 +109,13 @@ export default {
|
|||
this.$refs['box1'].style.height = height
|
||||
}
|
||||
},
|
||||
handleClickItem() {
|
||||
setTimeout(() => {
|
||||
this.$refs.inventoryDialog.setOpen({ open: true, maType: this.maType })
|
||||
}, 10)
|
||||
handleClickItem(index) {
|
||||
// console.log('🚀 ~ handleClickItem ~ index:', index);
|
||||
if (index < 5) {
|
||||
this.$refs.inventoryDialog.setOpen({ open: true, maType: 1 })
|
||||
} else {
|
||||
this.$refs.inventoryDialog.setOpen({ open: true, maType: 2 })
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<div class="count-title">
|
||||
<p>{{ sonTitle }}</p>
|
||||
<div class="count-flop" :key="compKey" @click="handleClick">
|
||||
<div class="count-flop" :key="compKey">
|
||||
<div
|
||||
:class="item != ',' ? 'count-flop-box' : 'count-flop-point'"
|
||||
v-for="(item, index) in value"
|
||||
|
|
@ -41,7 +41,6 @@ export default {
|
|||
value: [],
|
||||
numberList: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
|
||||
compKey: 0,
|
||||
maType: ''
|
||||
};
|
||||
},
|
||||
props: ["val", "suffix", 'sonTitle'],
|
||||
|
|
@ -53,18 +52,13 @@ export default {
|
|||
},
|
||||
mounted() {
|
||||
this.value = this.val.toString().split("");
|
||||
this.$eventBus.$on('maType', (maType) => {
|
||||
this.maType = maType
|
||||
});
|
||||
},
|
||||
destroyed() {
|
||||
this.$eventBus.$off('maType');
|
||||
},
|
||||
methods: {
|
||||
handleClick() {
|
||||
handleClick(maType) {
|
||||
console.log('🚀 ~ handleClick ~ maType:', maType);
|
||||
const params = {
|
||||
open: true,
|
||||
maType: this.maType
|
||||
maType
|
||||
}
|
||||
this.$refs.materialsDialog.setOpen(params);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<div class="count-title">
|
||||
<p>{{ sonTitle }}</p>
|
||||
<div class="count-flop" :key="compKey" @click="handleClick">
|
||||
<div class="count-flop" :key="compKey">
|
||||
<div
|
||||
:class="item != ',' ? 'count-flop-box' : 'count-flop-point'"
|
||||
v-for="(item, index) in value"
|
||||
|
|
@ -62,10 +62,10 @@ export default {
|
|||
this.$eventBus.$off('maType');
|
||||
},
|
||||
methods: {
|
||||
handleClick() {
|
||||
handleClick(maType) {
|
||||
const params = {
|
||||
open: true,
|
||||
maType: this.maType
|
||||
maType
|
||||
}
|
||||
this.$refs.returnMaterialsDialog.setOpen(params);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,9 +4,11 @@
|
|||
<div class="access-rate-box-title-bg">
|
||||
<h5 class="access-rate-box-title">领料数据</h5>
|
||||
</div>
|
||||
<CountFlopOne :val="num" sonTitle="施工机具今日出库"></CountFlopOne>
|
||||
<div class="access-rate-box-top">
|
||||
<CountFlopOne :val="num2" sonTitle="工器具今日出库"></CountFlopOne>
|
||||
<div @click="handleClick(1)">
|
||||
<CountFlopOne :val="num" sonTitle="施工机具今日出库" ref="countFlop"></CountFlopOne>
|
||||
</div>
|
||||
<div class="access-rate-box-top" @click="handleClick(2)">
|
||||
<CountFlopOne :val="num2" sonTitle="工器具今日出库" ref="countFlopTools"></CountFlopOne>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -54,7 +56,11 @@ export default {
|
|||
}
|
||||
},
|
||||
handleClick(maType) {
|
||||
this.$refs.countFlopOne.handleClick(maType)
|
||||
if (maType == 1) {
|
||||
this.$refs.countFlop.handleClick(maType)
|
||||
} else {
|
||||
this.$refs.countFlopTools.handleClick(maType)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<div class="access-rate-box-title-bg">
|
||||
<h5 class="access-rate-box-title">当月报废分析</h5>
|
||||
</div>
|
||||
<div id="accessRateEcharts" @click="handleClick">
|
||||
<div id="accessRateEcharts">
|
||||
<scrapAnalysisDialog ref="scrapAnalysisDialog" />
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -234,11 +234,10 @@ export default {
|
|||
}
|
||||
let myCharts = echarts.init(document.querySelector('#accessRateEcharts'));
|
||||
myCharts.setOption(echartOption)
|
||||
myCharts.off('click').on('click', () => {
|
||||
this.$refs.scrapAnalysisDialog.setOpen({ open: true, maType: this.maType})
|
||||
})
|
||||
},
|
||||
handleClick() {
|
||||
console.log('handleClick--报废分析')
|
||||
this.$refs.scrapAnalysisDialog.setOpen({ open: true, maType: this.maType})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,11 @@
|
|||
<div class="access-rate-box-title-bg">
|
||||
<h5 class="access-rate-box-title">退料数据</h5>
|
||||
</div>
|
||||
<CountFlopTwo :val="num" sonTitle="施工机具今日入库"></CountFlopTwo>
|
||||
<div class="access-rate-box-top">
|
||||
<CountFlopTwo :val="num2" sonTitle="工器具今日退料"></CountFlopTwo>
|
||||
<div @click="handleClick(1)">
|
||||
<CountFlopTwo :val="num" sonTitle="施工机具今日入库" ref="countFlop"></CountFlopTwo>
|
||||
</div>
|
||||
<div class="access-rate-box-top" @click="handleClick(2)">
|
||||
<CountFlopTwo :val="num2" sonTitle="工器具今日退料" ref="countFlopTools"></CountFlopTwo>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -53,7 +55,11 @@ export default {
|
|||
})
|
||||
},
|
||||
handleClick(maType) {
|
||||
this.$refs.countFlopOne.handleClick(maType)
|
||||
if (maType == 1) {
|
||||
this.$refs.countFlop.handleClick(maType)
|
||||
} else {
|
||||
this.$refs.countFlopTools.handleClick(maType)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -127,12 +127,18 @@ export default {
|
|||
{
|
||||
type: "category",
|
||||
gridIndex: 0,
|
||||
data: this.carNoList
|
||||
// data: this.carNoList
|
||||
axisLabel: {
|
||||
show: false
|
||||
}
|
||||
},
|
||||
{
|
||||
gridIndex: 1,
|
||||
type: "category",
|
||||
data: this.carNoList
|
||||
// data: this.carNoList
|
||||
axisLabel: {
|
||||
show: false
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "y",
|
||||
|
|
@ -147,7 +153,8 @@ export default {
|
|||
axisLabel: {
|
||||
show: true,
|
||||
color: '#c1c1c1',
|
||||
fontSize: 14,
|
||||
fontSize: 12,
|
||||
margin: 5,
|
||||
},
|
||||
data: this.carNoList
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@ module.exports = {
|
|||
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
|
||||
// target: `https://z.csgmall.com.cn`,
|
||||
|
||||
target: `http://10.40.92.13:38080`, //超
|
||||
// target: `http://10.40.92.13:38080`, //超
|
||||
// target: `http://10.40.92.81:8080`, //韩/
|
||||
// target: `http://10.40.92.74:8080`,//旭/
|
||||
// target: `http://10.40.92.140:28080`, //帅
|
||||
target: `http://10.40.92.138:28080`, //帅
|
||||
// target: `http://10.40.92.14:28080`, //福
|
||||
|
||||
//******** 注意事项 ********* */
|
||||
|
|
|
|||
Loading…
Reference in New Issue