bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-06-17 17:13:54 +08:00
parent 6a64086767 5da3ca0b18
commit a538a5eb84
6 changed files with 104 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -535,7 +535,7 @@
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
bpl.lot_id as proId,bpl.lot_name as proName,
bui.unit_id as unitId,bui.unit_name as unitName,
lai.lease_person as leasePerson, lai.phone as leasePhone,lai.lease_type as leaseType, lai.estimate_lease_time as estimateLeaseTime,su.user_name as applyFor,d.`name` as taskName,
lai.lease_person as leasePerson, lai.phone as leasePhone,lai.lease_type as leaseType, lai.estimate_lease_time as estimateLeaseTime,su.nick_name as applyFor,d.`name` as taskName,
case when d.id = '31' then lai.company_audit_remark
when d.id = '32' then lai.dept_audit_remark
when d.id = '33' then lai.direct_audit_remark
@ -1026,52 +1026,56 @@
lad.id
</select>
<select id="getLeaseOutListByUser" resultType="com.bonus.sgzb.app.domain.TmTask">
SELECT
tt.*,
lai.id AS id,
bpl.lot_id AS proId,
bpl.lot_name AS proName,
bui.unit_id AS unitId,
bui.unit_name AS unitName,
lai.lease_person AS leasePerson,
lai.phone AS leasePhone,
tt.create_by AS applyFor,
d.`name` AS taskName,
lai.lease_type AS leaseType,
d.id AS examineStatusId,
bai.agreement_code AS agreementCode,
tt.create_time AS createTimes,
IFNULL(sum(lad.pre_num),0) as preCountNum,
IFNULL(sum(lad.al_num),0) as alNum,
tt.update_time AS updateTimes
from
lease_apply_info lai
LEFT JOIN tm_task tt on lai.task_id = tt.task_id
LEFT JOIN sys_dic d ON d.id = tt.task_status
LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN lease_apply_details lad on lai.id = lad.parennt_id
LEFT JOIN ma_type_keeper mtk on lad.type_id = mtk.type_id
WHERE tt.task_status in(33,34,35)
<if test="userId != 1">
and mtk.user_id = #{userId}
</if>
<if test="code != null and code != ''">
and tt.code like concat('%', #{code}, '%')
</if>
<if test="unitId != null">
and bui.unit_id = #{unitId}
</if>
<if test="proId != null">
and bpl.lot_id = #{proId}
</if>
<if test="taskStatus != null">
and tt.task_status = #{taskStatus}
</if>
GROUP BY lai.id
ORDER BY tt.task_status,tt.create_time desc
SELECT
tt.*,
lai.id AS id,
bpl.lot_id AS proId,
bpl.lot_name AS proName,
bui.unit_id AS unitId,
bui.unit_name AS unitName,
lai.lease_person AS leasePerson,
lai.phone AS leasePhone,
tt.create_by AS applyFor,
d.`name` AS taskName,
lai.lease_type AS leaseType,
d.id AS examineStatusId,
bai.agreement_code AS agreementCode,
tt.create_time AS createTimes,
IFNULL( sum( lad.pre_num ), 0 ) AS preCountNum,
IFNULL( sum( lad.al_num ), 0 ) AS alNum,
tt.update_time AS updateTimes
FROM
lease_apply_info lai
LEFT JOIN tm_task tt ON lai.task_id = tt.task_id
LEFT JOIN sys_dic d ON d.id = tt.task_status
LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN lease_apply_details lad ON lai.id = lad.parennt_id
LEFT JOIN ( SELECT mtk.type_id, mtk.user_id FROM ma_type_keeper mtk LEFT JOIN lease_apply_details lad1 ON lad1.type_id = mtk.type_id LIMIT 1 ) aa ON lad.type_id = aa.type_id
WHERE
tt.task_status IN ( 33, 34, 35 )
<if test="userId != 1">
and aa.user_id = #{userId}
</if>
<if test="code != null and code != ''">
and tt.code like concat('%', #{code}, '%')
</if>
<if test="unitId != null">
and bui.unit_id = #{unitId}
</if>
<if test="proId != null">
and bpl.lot_id = #{proId}
</if>
<if test="taskStatus != null">
and tt.task_status = #{taskStatus}
</if>
GROUP BY
lai.id
ORDER BY
tt.task_status,
tt.create_time DESC
</select>
<select id="getLeaseDetailByParentId" resultType="com.bonus.sgzb.app.domain.TmTask">
SELECT

22
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -294,18 +294,20 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
scrapApplyDetails.setCompanyId((long) companyId);
scrapApplyDetails.setAuditRemark(bean.getScrapReason());
//根据fileIds获取所有的图片地址
String[] fileIsList = bean.getFileIds().split(",");
StringBuffer fileUrl = new StringBuffer();
for (int i = 0; i < fileIsList.length; i++) {
SysFile sysFile = sysFileMapper.selectSysFileInfoById(Long.valueOf(fileIsList[i]));
//对获取的图片地址进行拼接
if (i==fileIsList.length-1){
fileUrl.append(sysFile.getFileUrl());
}else {
fileUrl.append(sysFile.getFileUrl()+",");
if (bean.getFileIds()!=null){
String[] fileIsList = bean.getFileIds().split(",");
StringBuffer fileUrl = new StringBuffer();
for (int i = 0; i < fileIsList.length; i++) {
SysFile sysFile = sysFileMapper.selectSysFileInfoById(Long.valueOf(fileIsList[i]));
//对获取的图片地址进行拼接
if (i==fileIsList.length-1){
fileUrl.append(sysFile.getFileUrl());
}else {
fileUrl.append(sysFile.getFileUrl()+",");
}
}
scrapApplyDetails.setFileUrl(fileUrl.toString());
}
scrapApplyDetails.setFileUrl(fileUrl.toString());
scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
}
}

38
sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
View File

@ -335,6 +335,14 @@ import {
export default {
// name: "ReceiveApply",
dicts: ['sys_normal_disable'],
props: {
routerParams: {
type: Object,
default: () => {
return {}
},
},
},
data() {
return {
// 遮罩层
@ -363,7 +371,7 @@ export default {
time: null, //申请时间
unitId: null, //来往单位id
proId: null, //工程id
proId: undefined, //工程id
types: 1, // 1申请列表 2审核列表
keyWord: '',
@ -374,6 +382,9 @@ export default {
}
},
created() {
if (this.routerParams.pageNum) {
this.queryParams = this.routerParams
}
this.getList()
this.GetUnitData()
this.GetProData()
@ -407,8 +418,8 @@ export default {
id: this.queryParams.proId,
}
const res = await getUnitData(params)
res.data = res.data.filter(item => item != null)
this.unitList = res.data
console.log('GetUnitData ======================', res)
},
// 获取 工程名称 列表数据
async GetProData() {
@ -416,8 +427,8 @@ export default {
id: this.queryParams.unitId,
}
const res = await getProData(params)
res.data = res.data.filter(item => item != null)
this.proList = res.data
console.log('GetProData ======================', res)
},
// 表单重置
@ -438,9 +449,18 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams.time = []
this.queryParams.unitId = ''
this.queryParams.proId = ''
this.queryParams = {
pageNum: 1,
pageSize: 10,
dictName: undefined,
dictType: undefined,
status: undefined,
time: null, //申请时间
unitId: null, //来往单位id
proId: undefined, //工程id
types: 1, // 1申请列表 2审核列表
keyWord: '',
}
this.resetForm('queryForm')
this.GetUnitData()
this.GetProData()
@ -477,7 +497,7 @@ export default {
// this.$tab.refreshPage()
// })
this.$emit('viewPicking', row.taskId)
this.$emit('viewPicking', row.taskId, this.queryParams)
},
/** 修改按钮操作 */
handleUpdate(row) {
@ -488,7 +508,7 @@ export default {
// isEdit: true,
// },
// })
this.$emit('editPicking', row.taskId)
this.$emit('editPicking', row.taskId, this.queryParams)
},
/** 驳回按钮操作 */
handleUpdate2(row) {
@ -500,7 +520,7 @@ export default {
// isBack: true,
// },
// })
this.$emit('editPicking', row.taskId, row.taskStatus)
this.$emit('editPicking', row.taskId, this.queryParams, row.taskStatus)
},
/** 删除按钮操作 */
async handleDelete(row) {

9
sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
View File

@ -12,6 +12,7 @@
:isView="isView"
:isEdit="isEdit"
:rejectTaskStatus="rejectTaskStatus"
:routerParams="routerParams"
@addPicking="addPicking"
@viewPicking="viewPicking"
@editPicking="editPicking"
@ -38,6 +39,7 @@ export default {
rejectTaskStatus: '',
isView: false,
isEdit: false,
routerParams: {},
}
},
methods: {
@ -48,23 +50,26 @@ export default {
this.isEdit = false
this.pageContent = '新增领料任务'
this.isShowComponent = 'AddPicking'
this.routerParams = {}
},
/* 查看领料任务 */
viewPicking(taskId) {
viewPicking(taskId, routerParams) {
this.viewTaskId = taskId
this.pageContent = '领料任务详情'
this.isView = false
this.isEdit = true
this.isShowComponent = 'AddPicking'
this.routerParams = routerParams
},
/* 编辑和驳回提交 */
editPicking(taskId, taskStatus) {
editPicking(taskId, routerParams, taskStatus) {
this.viewTaskId = taskId
this.rejectTaskStatus = taskStatus || null
this.isView = true
this.isEdit = true
this.pageContent = '领料任务编辑'
this.isShowComponent = 'AddPicking'
this.routerParams = routerParams
},
goBack() {
this.isShowComponent = 'Home'

2
sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
View File

@ -567,7 +567,7 @@ export default {
{ name: '待内部审核', id: 32 },
{ name: '待出库', id: 33 },
{ name: '出库进行中', id: 34 },
{ name: '已完成', id: 35 },
{ name: '完成', id: 35 },
],
}
},

4
sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -23,6 +23,7 @@
v-model="queryParams.unitId"
placeholder="请选择单位名称"
clearable
filterable
>
<el-option
v-for="item in unitList"
@ -720,6 +721,8 @@ export default {
//编码出库
codeOut(row) {
// this.title = '编码出库'
this.resetForm('codeOutForm')
this.resetForm('outQuery')
this.openCode = true
this.outNum = row.outNum
this.outQuery.typeId = row.typeId
@ -732,6 +735,7 @@ export default {
// this.title = '数量出库'
this.openNum = true
this.resetForm('numOutForm')
this.resetForm('outQuery')
// console.log(row)
let obj = {}
this.$set(obj, 'taskId', row.taskId)