root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev: 出入库任务修改

Browse Source
This commit is contained in:
liuxy
2023-06-05 11:11:47 +08:00
parent bc5c3361ab
commit 28ae81907d
6 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml
View File

@@ -78,11 +78,17 @@
disdtl.bucketunique,
mater.material_code,
mater.material_name,
mater.material_spec
mater.material_spec,
task.task_code,
task.task_status,
task.task_type,
task.point_code1,
task.point_code2
FROM
st_ivt_iostorinvdis_cp dis
LEFT JOIN ST_IVT_IOStorInvDisDtl_CP disdtl ON disdtl.iostorinvdis_id = dis.iostorinvdis_id
LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
LEFT JOIN sch_base_task task ON task.task_id = dis.task_id
WHERE 1=1
<if test="iostorinvdtl_id != null and iostorinvdtl_id != ''">
and dis.iostorinvdtl_id = #{iostorinvdtl_id}
@@ -98,10 +104,16 @@
dis.*,
mater.material_code,
mater.material_name,
mater.material_spec
mater.material_spec,
task.task_code,
task.task_status,
task.task_type,
task.point_code1,
task.point_code2
FROM
st_ivt_iostorinvdis_cp dis
LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
LEFT JOIN sch_base_task task ON task.task_id = dis.task_id
WHERE 1=1
<if test="iostorinvdtl_id != null and iostorinvdtl_id != ''">
and dis.iostorinvdtl_id = #{iostorinvdtl_id}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
View File

@@ -417,7 +417,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
);
boolean is_dis = dtlDaoList.stream()
.anyMatch(row -> row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完")));
.allMatch(row -> row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完")) || row.getBill_status().equals(IOSEnum.BILL_STATUS.code("完成")));
if (!is_dis) throw new BadRequestException("请先分配单据!");

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
View File

@@ -595,14 +595,14 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
mstDao.setConfirm_time(DateUtil.now());
this.updateById(mstDao);
// 2.判断所有明细是否为分配完
// 2.判断所有明细是否为分配完或者为完成
List<StIvtIostorinvdtlCp> dtlDaoList = iostorinvdtlCpService.list(
new QueryWrapper<StIvtIostorinvdtlCp>().lambda()
.eq(StIvtIostorinvdtlCp::getIostorinv_id, whereJson.getString("iostorinv_id"))
);
boolean is_dis = dtlDaoList.stream()
.anyMatch(row -> row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完")));
.allMatch(row -> row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完")) || row.getBill_status().equals(IOSEnum.BILL_STATUS.code("完成")));
if (!is_dis) throw new BadRequestException("请先分配单据!");

11
mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue
View File

@@ -141,7 +141,8 @@
<el-table-column prop="point_code1" label="起始位置" align="center" />
<el-table-column prop="point_code2" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="task_type_name" label="任务类型" align="center" width="150px" />
<el-table-column prop="task_status" label="任务状态" align="center" :formatter="formatStatus"/>
<el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="formatType"/>
</el-table>
</el-card>
</el-dialog>
@@ -156,7 +157,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS'],
dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status', 'SCH_TASK_TYPE_DTL'],
props: {
dialogShow: {
type: Boolean,
@@ -247,6 +248,12 @@ export default {
this.tabledis = []
})
}
},
formatStatus(row) {
return this.dict.label.task_status[row.task_status]
},
formatType(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.task_type]
}
}
}

4
mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
View File

@@ -445,11 +445,13 @@ export default {
this.crud.notify('请选择分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
this.loadingSetAllPoint = true
productOut.setPoint({ 'iostorinvdis_id': this.currentDis.iostorinvdis_id, 'point_code': this.form2.point_code }).then(res => {
this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.queryTableDtl()
this.tabledis = []
}).finally(() => {
this.loadingSetAllPoint = false
})
},
cellStyle({ row, column, rowIndex, columnIndex }) {

11
mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue
View File

@@ -141,7 +141,8 @@
<el-table-column prop="point_code1" label="起始位置" align="center" />
<el-table-column prop="point_code2" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="task_type_name" label="任务类型" align="center" width="150px" />
<el-table-column prop="task_status" label="任务状态" align="center" :formatter="formatStatus"/>
<el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="formatType"/>
</el-table>
</el-card>
</el-dialog>
@@ -156,7 +157,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['ST_INV_OUT_TYPE', 'product_area', 'IO_BILL_STATUS'],
dicts: ['ST_INV_OUT_TYPE', 'product_area', 'IO_BILL_STATUS','task_status', 'SCH_TASK_TYPE_DTL'],
props: {
dialogShow: {
type: Boolean,
@@ -247,6 +248,12 @@ export default {
this.tabledis = []
})
}
},
formatStatus(row) {
return this.dict.label.task_status[row.task_status]
},
formatType(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.task_type]
}
}
}