From d1cfef3e27f29460ca497c9b8071c456b2890420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com> Date: Fri, 3 Feb 2023 09:09:54 +0800 Subject: [PATCH] 2023-02-03 --- ant-design-vue-jeecg/src/main.js | 4 +- .../src/views/system/Depart3List.vue | 4 +- .../src/views/system/modules/DepartModal.vue | 6 +- .../zyWorkorderManagement/ZyWorkOrderList.vue | 6 +- .../controller/WorkOrderController.java | 2 +- .../service/impl/WorkOrderServiceImpl.java | 73 +++++++++++++++---- 6 files changed, 70 insertions(+), 25 deletions(-) diff --git a/ant-design-vue-jeecg/src/main.js b/ant-design-vue-jeecg/src/main.js index d539d2a6..be83b4ac 100644 --- a/ant-design-vue-jeecg/src/main.js +++ b/ant-design-vue-jeecg/src/main.js @@ -12,8 +12,8 @@ import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; import './views/shopping/assets/iconfont/iconfont.css'//引入商城所需图标 // YU-优化 - require('@jeecg/antd-online-mini') - require('@jeecg/antd-online-mini/dist/OnlineForm.css') +// require('@jeecg/antd-online-mini') +// require('@jeecg/antd-online-mini/dist/OnlineForm.css') // 引入 按需组件的统一引入文件 //import './components/use' import Antd, { version } from 'ant-design-vue' diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue index 1a7bb904..2eea3942 100644 --- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue +++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue @@ -158,7 +158,7 @@ - + - + { if (res.success) { this.$message.success("撤销成功！"); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java index 607155e0..49a12936 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java @@ -278,7 +278,7 @@ public class WorkOrderController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - queryWrapper.eq("org_type",1); + // queryWrapper.eq("org_type",1); queryWrapper.eq("org_category",2); IPage pageList = sysDepartService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java index 6d71b47c..bb181316 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java @@ -2,6 +2,7 @@ package org.jeecg.modules.workorder.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; @@ -173,6 +174,8 @@ public class WorkOrderServiceImpl extends ServiceImpl0) {//start if 02 // 保存工单 + + //获取订单商品 OrderGoods ogModel=ogList.get(0); //服装款式 @@ -199,6 +202,7 @@ public class WorkOrderServiceImpl extends ServiceImpl0) + if(goodNum>0) { //量体数据 CustomerMeasure mesureModel=customerMeasureMapper.selectById(ogModel.getMeasureId()); @@ -219,7 +224,7 @@ public class WorkOrderServiceImpl extends ServiceImpl cancellationWorkOrder(WorkOrder woModel) { + //根据工单获取产品列表，然后循环删除产品列表中的工序，以及工序对应的设备、工具，再删除产品中对应模块、面料、辅料 - //ZyProduct //工单 - //-产品 - //-工序 + //-产品 + QueryWrapper productWrapper = new QueryWrapper(); + productWrapper.eq("work_order_id", woModel.getId()); + List productList = productMapper.selectList(productWrapper); + + for (ZyProduct model:productList) + { + //-工序 + QueryWrapper productProcessWrapper = new QueryWrapper(); + productProcessWrapper.eq("product_id",model.getId()); + productProcessMapper.delete(productProcessWrapper); + //-工具 + QueryWrapper productOperationtoolWrapper = new QueryWrapper(); + productOperationtoolWrapper.eq("product_id",model.getId()); + productOperationtoolMapper.delete(productOperationtoolWrapper); + //-设备 + QueryWrapper productMachineWrapper = new QueryWrapper(); + productMachineWrapper.eq("product_id",model.getId()); + productMachineMapper.delete(productMachineWrapper); + + //产品模块 + QueryWrapper productModuleWrapper = new QueryWrapper(); + productModuleWrapper.eq("product_id",model.getId()); + productModuleMapper.delete(productModuleWrapper); + + //产品面料 + QueryWrapper productFabricWrapper = new QueryWrapper(); + productFabricWrapper.eq("product_id",model.getId()); + productFabricMapper.delete(productFabricWrapper); + + //产品面料 + QueryWrapper productAccessoriesWrapper = new QueryWrapper(); + productAccessoriesWrapper.eq("product_id",model.getId()); + productAccessoriesMapper.delete(productAccessoriesWrapper); + } - return null; + + //修改订单 + UpdateWrapper updateWrapper = new UpdateWrapper(); + updateWrapper.eq("id", woModel.getOrdersId()); + updateWrapper.set("delivery_status", 2); + int update = zyOrdersMapper.update(null, updateWrapper); + + //产品 + productMapper.delete(productWrapper); + //工单 + baseMapper.deleteById(woModel.getId()); + return Result.OK("成功"); }