From 28ae81907da561f539b1c13e143891f2c5ba3093 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 5 Jun 2023 11:11:47 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E5=87=BA=E5=85=A5=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/xml/StIvtIostorinvdisCpMapper.xml | 16 ++++++++++++++-- .../impl/StIvtIostorinvCpOutServiceImpl.java | 2 +- .../impl/StIvtIostorinvCpServiceImpl.java | 4 ++-- .../product/productIn/ViewDialog.vue | 11 +++++++++-- .../product/productOut/DivDialog.vue | 4 +++- .../product/productOut/ViewDialog.vue | 11 +++++++++-- 6 files changed, 38 insertions(+), 10 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml index b8a8d20e..6142e5fa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml @@ -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 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 and dis.iostorinvdtl_id = #{iostorinvdtl_id} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java index 270bb463..0452dfa9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java @@ -417,7 +417,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl 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("请先分配单据!"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java index a1835075..8263859e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java @@ -595,14 +595,14 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl dtlDaoList = iostorinvdtlCpService.list( new QueryWrapper().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("请先分配单据!"); diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue index 19858b46..70ace6bd 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue @@ -141,7 +141,8 @@ - + + @@ -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] } } } diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue index 8b7e169a..0ad11270 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue @@ -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 }) { diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue index d29d049c..12e66c89 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue @@ -141,7 +141,8 @@ - + + @@ -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] } } }