From 5806db8792057f0216381149a0f2441907161608 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 10 Sep 2024 16:46:54 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=85=A5=E5=BA=93=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=92=8C=E5=B7=A5=E5=8D=95=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/service/dto/MaterialQuery.java | 2 + .../service/impl/MaterialServiceImpl.java | 4 +- .../sch/task_manage/task/tasks/YCLCKTask.java | 11 ---- .../service/impl/WorkorderServiceImpl.java | 3 +- .../views/wms/pdm/workerordertwo/index.vue | 61 +++++++++---------- .../src/views/wms/sch/material/index.vue | 32 +++++++--- 6 files changed, 60 insertions(+), 53 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dto/MaterialQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dto/MaterialQuery.java index 2407d61..d03d0a0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dto/MaterialQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dto/MaterialQuery.java @@ -18,4 +18,6 @@ public class MaterialQuery implements Serializable { private String supplierCode; //绑定状态 private String group_bind_material_status; + //绑定状态 + private String return_status; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java index 7ac3267..a4d8785 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java @@ -35,7 +35,9 @@ public class MaterialServiceImpl extends ServiceImpl i wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()),Material::getProductName,whereJson.getProductName()); wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()),Material::getSupplierCode,whereJson.getSupplierCode()); wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()),Material::getProductDescription,whereJson.getProductDescription()); - wrapper.like(StringUtils.isNotBlank(whereJson.getGroup_bind_material_status()),Material::getGroup_bind_material_status,whereJson.getGroup_bind_material_status()); + wrapper.eq(StringUtils.isNotBlank(whereJson.getGroup_bind_material_status()),Material::getGroup_bind_material_status,whereJson.getGroup_bind_material_status()); + wrapper.eq(StringUtils.isNotBlank(whereJson.getReturn_status()),Material::getReturn_status,whereJson.getReturn_status()); + wrapper.orderByDesc(Material::getCreate_time); pages = materialMapper.selectPage(pages, wrapper); return pages; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java index 38ee9de..b37f68f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java @@ -330,17 +330,6 @@ public class YCLCKTask extends AbstractTask { .execute().body(); log.info("QPMES065服务调用成功，反馈{}",resultMsg); JSONObject result = JSONObject.parseObject(resultMsg); - String Code = result.getString("Code"); - if(ObjectUtil.isNotEmpty(Code) && "0".equals(Code)){ - //更新接口表 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(Material::getPalletSN,taskObj.getVehicle_code2()); - updateWrapper.eq(Material::getGroup_bind_material_status,GroupBindMaterialStatusEnum.BOUND.getValue()); - //回传状态为0的 - updateWrapper.eq(Material::getReturn_status,"1"); - updateWrapper.set(Material::getReturn_status,"2"); - materialMapper.update(null,updateWrapper); - } String code = result.getString("code"); if(ObjectUtil.isNotEmpty(code) && "0".equals(code)){ //更新接口表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java index 87e50ee..023de53 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java @@ -69,7 +69,8 @@ public class WorkorderServiceImpl extends ServiceImpl - + @@ -46,6 +46,22 @@ @keyup.enter.native="crud.toQuery" /> + + + + + @@ -66,28 +82,18 @@ + - + - - - - @@ -97,18 +103,18 @@ import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import PointDetailDialog from '@/views/wms/pdm/workerordertwo/PointDetailDialog.vue' export default { - name: 'Workorder', - components: { PointDetailDialog, pagination, crudOperation, rrOperation, udOperation }, + name: 'Workordertwo', + dicts: ['work_order_two_status'], + components: { pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), crud()], cruds() { return CRUD({ title: '晶棒工单管理', url: 'api/workorder', idField: 'workorder_id', - sort: 'workorder_id,desc', + sort: '', optShow: { add: false, edit: false, @@ -122,16 +128,7 @@ export default { return { permission: {}, rules: { - }, - queryTypeOptions: [ - { key: 'workorder_code', display_name: '工单编号' }, - { key: 'point_code', display_name: '设备编码' } - ], - workorder_code: '', - productname: '', - pointList: [], - pointDetailDialog: false, - message: null + } } }, created() { @@ -141,11 +138,9 @@ export default { [CRUD.HOOK.beforeRefresh]() { return true }, - doOperate(row) { - this.workorder_code = row.moname - this.productname = row.productName - this.pointDetailDialog = true - } + format_work_order_two_status(row, column) { + return this.dict.label.work_order_two_status[row.status] + }, } } diff --git a/lms/nladmin-ui/src/views/wms/sch/material/index.vue b/lms/nladmin-ui/src/views/wms/sch/material/index.vue index f54161a..43d7106 100644 --- a/lms/nladmin-ui/src/views/wms/sch/material/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/material/index.vue @@ -62,7 +62,7 @@ size="mini" placeholder="绑定状态" class="filter-item" - @change="hand" + @change="crud.toQuery" > + + + + + @@ -95,11 +111,16 @@ - + + + + @@ -117,7 +138,7 @@ import pagination from '@crud/Pagination' export default { name: 'Material', - dicts: ['group_bind_material_status'], + dicts: ['group_bind_material_status','return_status'], components: { pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), crud()], cruds() { @@ -125,7 +146,7 @@ export default { title: '原材料入库管理', url: 'api/material', idField: 'group_id', - sort: 'vehicle_code,desc', + sort: '', optShow: { add: false, edit: false, @@ -153,9 +174,6 @@ export default { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { return true - }, - hand(value) { - this.crud.toQuery() } } }