From 1e83257581d24ae27b6e6567635a44e28305122e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com>
Date: Sat, 8 Apr 2023 08:48:51 +0800
Subject: [PATCH 1/6] 2023-04-08

---
 ant-design-vue-jeecg/package.json             |  1 -
 .../src/views/device/modules/ZyDeviceForm.vue |  2 +-
 .../impl/HangerLocationServiceImpl.java       | 86 ++-----------------
 .../service/impl/HangerMakerServiceImpl.java  |  3 +
 4 files changed, 10 insertions(+), 82 deletions(-)

diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json
index 730bfbbc..430c5426 100644
--- a/ant-design-vue-jeecg/package.json
+++ b/ant-design-vue-jeecg/package.json
@@ -11,7 +11,6 @@
   },
   "dependencies": {
     "@antv/data-set": "^0.11.4",
-    "@jeecg/antd-online-mini": "2.4.5-RC",
     "@jiaminghi/data-view": "^2.10.0",
     "@tinymce/tinymce-vue": "2.1.0",
     "@toast-ui/editor": "^2.1.2",
diff --git a/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue b/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
index 1584eb5a..37fd658a 100644
--- a/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
+++ b/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
@@ -139,7 +139,7 @@
         validatorRules: {
           name:[
             { required: true, message: '请输入设备名称!'},
-            {min: 1, max: 50, message: '最多输入50字！', trigger: 'blur'},
+            {min: 1, max: 200, message: '最多输入200字！', trigger: 'blur'},
           ],
         },
         url: {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java
index fbcccaf0..0c78db0c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java
@@ -1,6 +1,7 @@
 package org.jeecg.modules.hangerlocation.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.common.util.XJobUtils;
 import org.jeecg.modules.hangerlocation.entity.HangerLocation;
 import org.jeecg.modules.hangerlocation.mapper.HangerLocationMapper;
 import org.jeecg.modules.hangerlocation.service.IHangerLocationService;
@@ -16,6 +17,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import static org.jeecg.common.util.XJobUtils.dateToLong;
+
 /**
  * @Description: 衣架定位表
  * @Author: jeecg-boot
@@ -56,7 +59,7 @@ public class HangerLocationServiceImpl extends ServiceImpl<HangerLocationMapper,
                 //服装进入制作工艺过程
                 long timeMillis = System.currentTimeMillis();
                 //将获取时间转为日期类型
-                Date start_time=longToDate(timeMillis);
+                Date start_time=XJobUtils.longToDate(timeMillis);
                 QueryWrapper<HangerMaker> qwhm=new QueryWrapper();
                 qwhm.eq("order_code",entry.getKey());
                 HangerMaker hm=hangerMakerMapper.selectOne(qwhm);
@@ -86,13 +89,13 @@ public class HangerLocationServiceImpl extends ServiceImpl<HangerLocationMapper,
                     /**到达时间*/
                     model.setArrivalTime(start_time);
                     /**离开时间*/
-                    Date end_time=returnEXtime(start_time);
+                    Date end_time= XJobUtils.randomIntervaltime(start_time,3,5);
                     model.setLeaveTime(end_time);
                     /**时长*/
                     model.setDuration(dateToLong(start_time,end_time)+"");
 
                     //执行下一步间隔时间
-                    start_time=returnIntervaltime(end_time);
+                    start_time=XJobUtils.randomIntervaltime(end_time,1,3);
                     hangerLocationMapper.insert(model);
                 }
 //                System.out.println(entry.getKey());
@@ -101,81 +104,4 @@ public class HangerLocationServiceImpl extends ServiceImpl<HangerLocationMapper,
         }
     }
 
-    /**
-     * 获取制作时间
-     * @param start_Date
-     * @return
-     */
-    private Date returnEXtime(Date start_Date)
-    {
-        //将时间转为long类型
-        long start=start_Date.getTime();
-        //获取5-20分钟对应毫秒
-        long intervalTime=randInt(300,1200)*1000;
-        //总共花费时长
-        long timeMillis =start+intervalTime;
-        //实例化日期对象
-        Calendar calendar = Calendar.getInstance();
-        //将毫秒值传入转Date类型
-        calendar.setTimeInMillis(timeMillis);
-        //Calendar --> date
-        Date time = calendar.getTime();
-        return  time;
-    }
-    /**
-     * 获取间隔时间
-     * @param start_Date
-     * @return
-     */
-    private Date returnIntervaltime(Date start_Date)
-    {
-        //将时间转为long类型
-        long start=start_Date.getTime();
-        //获取30-180秒对应毫秒
-        long intervalTime=randInt(30,180)*1000;
-        //总共花费时长
-        long timeMillis =start+intervalTime;
-
-        return  longToDate(timeMillis);
-    }
-
-    /**
-     * 其实这是基于一个公式 如果要取一个范围在[min,max]之间的随机整数那么公式如下
-     * @param min
-     * @param max
-     * @return
-     */
-    private int randInt(int min,int max)
-    {
-        Random rand = new Random();
-        // nextInt通常不包含顶部值，因此加上1使其包含
-        int randomNum = rand.nextInt((max - min) + 1) + min;
-        return randomNum;
-    }
-
-
-
-    //将long转为日期
-    private Date longToDate(long  lo)
-    {
-        SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        //long转Date
-        Date date = null;
-        try {
-            date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(sd.format(new Date(lo)));
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return date;
-    }
-
-    //将日期转为long
-    private long dateToLong(Date s,Date e)
-    {
-
-        long sl=s.getTime();
-        long el=e.getTime();
-        long r=el-sl;
-        return (el-sl)/1000;
-    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangermaker/service/impl/HangerMakerServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangermaker/service/impl/HangerMakerServiceImpl.java
index 86671a0b..1372a9dc 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangermaker/service/impl/HangerMakerServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangermaker/service/impl/HangerMakerServiceImpl.java
@@ -30,6 +30,9 @@ public class HangerMakerServiceImpl extends ServiceImpl<HangerMakerMapper, Hange
 
     @Autowired
     private WorkOrderMapper workOrderMapper;
+
+
+
     /**
      * 自动衣架绑定工单
      * @param woList

From f05c26d52b14669de3a481fc65b4b1cf9047457b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com>
Date: Sat, 8 Apr 2023 16:51:11 +0800
Subject: [PATCH 2/6] 2023-04-08-02

---
 .../views/process/modules/ZyProcessForm.vue   |  2 +-
 .../java/org/jeecg/common/util/XJobUtils.java | 86 +++++++++++++++++++
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/XJobUtils.java

diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
index 934ae5f2..15f20fdb 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
@@ -9,7 +9,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
+            <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeName ">
               <j-popup
                   v-model="model.typeName"
                   field="type_name"
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/XJobUtils.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/XJobUtils.java
new file mode 100644
index 00000000..24c6ccb8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/XJobUtils.java
@@ -0,0 +1,86 @@
+package org.jeecg.common.util;
+
+import org.springframework.util.StringUtils;
+
+import java.beans.PropertyEditorSupport;
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Random;
+
+/**
+ * 定时类使用的方法
+ */
+public class XJobUtils{
+
+
+    /**
+     * 获取间隔时间
+     * @param start_Date
+     * @return
+     */
+    public static Date randomIntervaltime(Date start_Date,int s,int e)
+    {
+        //将时间转为long类型
+        long start=start_Date.getTime();
+        //获取30-180秒对应毫秒
+        long intervalTime=randInt(s*60,s*60)*1000;
+        //总共花费时长
+        long timeMillis =start+intervalTime;
+
+        return  longToDate(timeMillis);
+    }
+
+    /**
+     * 其实这是基于一个公式 如果要取一个范围在[min,max]之间的随机整数那么公式如下
+     * @param min
+     * @param max
+     * @return
+     */
+    public static int randInt(int min,int max)
+    {
+        Random rand = new Random();
+        // nextInt通常不包含顶部值，因此加上1使其包含
+        int randomNum = rand.nextInt((max - min) + 1) + min;
+        return randomNum;
+    }
+
+
+
+    //将long转为日期
+    public static Date longToDate(long  lo)
+    {
+        SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //long转Date
+        Date date = null;
+        try {
+            date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(sd.format(new Date(lo)));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
+    //间隔时间（秒）
+    public static long dateToLong(Date s,Date e)
+    {
+
+        long sl=s.getTime();
+        long el=e.getTime();
+        long r=el-sl;
+        return (el-sl)/1000;
+    }
+
+    //随机暂停s-e分钟（）
+    public static void sleepTime(int s ,int e) throws InterruptedException {
+
+        Thread.sleep(randInt(60*1000*s,60*1000*e));
+    }
+
+
+
+}
\ No newline at end of file

From bc066482b97463752e2d8de0bda2302ec4a3377d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com>
Date: Tue, 18 Apr 2023 10:40:19 +0800
Subject: [PATCH 3/6] 2023-04-18-01-bug

---
 .../src/views/device/modules/ZyDeviceForm.vue |  6 +--
 .../erp/fabric/modules/ZyFabricTypeForm.vue   | 10 ++++-
 .../src/views/system/modules/DepartModal.vue  |  2 +-
 .../service/impl/ZyOrdersServiceImpl.java     | 38 ++++++++++++-------
 .../impl/ZyPlanProcessServiceImpl.java        | 19 +++++++---
 .../impl/ZyProductPlanServiceImpl.java        |  2 +-
 6 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue b/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
index 37fd658a..e9ee3463 100644
--- a/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
+++ b/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
@@ -77,8 +77,8 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="设备品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <j-dict-select-tag v-model="model.canshu" dictCode="zy_devicebrand,brand,id"
-                                 placeholder="设备品牌" @change="canshu"></j-dict-select-tag>
+              <j-dict-select-tag v-model="model.brandId" dictCode="zy_devicebrand,brand,id"
+                                 placeholder="设备品牌" ></j-dict-select-tag>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -161,7 +161,7 @@
     methods: {
       canshu(){
         this.parm1.brand_id=this.model.canshu
-        console.log(this.parm1)
+        // console.log(this.parm1)
       },
       add () {
         this.edit(this.modelDefault);
diff --git a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue
index ec14ee55..736c1a0c 100644
--- a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue
+++ b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue
@@ -82,7 +82,15 @@
       add () {
         var n=4
         getAction(this.url.weiyi,{id:this.model.nums}).then((res)=>{
-          var num=parseInt(res.result,10)+1
+          var num="";
+          if(res.message!="")
+          {
+            num=parseInt(res.message,10)+1
+          }else
+          {
+            num="0001";
+          }
+          var num=parseInt(res.message,10)+1
           num=num.toString()
           while(num.length<n){
             num="0"+num
diff --git a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
index 5e75929e..e4828404 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
@@ -41,7 +41,7 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="缩写">
-          <a-input placeholder="请输入手机号" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
+          <a-input placeholder="请输入缩写" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
         </a-form-item>
 
         <template v-if="orgCategoryDisabled">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java
index da05bb5e..0410502a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java
@@ -188,20 +188,30 @@ public class ZyOrdersServiceImpl extends ServiceImpl<ZyOrdersMapper, ZyOrders> i
         zyOrders.setOrdersType(zyOrdersJk.getOrdersType());
         zyOrders.setUserId(zyOrdersJk.getUserId());
         zyOrders.setGoodsQuantity(zyOrdersJk.getGoodsQuantity());
-        CustomerReceivingAddress customerReceivingAddress = customerReceivingAddressMapper.selectById(zyOrdersJk.getAddressId());
-        zyOrders.setCityId(customerReceivingAddress.getCityId());
-        zyOrders.setAddress(customerReceivingAddress.getAddress());
-        zyOrders.setZipCode(customerReceivingAddress.getZipCode());
-        zyOrders.setReceiver(zyOrdersJk.getReceiver());
-        zyOrders.setMobile(customerReceivingAddress.getMobile());
-        CustomerInvoice customerInvoice = customerInvoiceMapper.selectById(zyOrdersJk.getInvoiceId());
-        zyOrders.setInvoiceCustomerType(Integer.parseInt(customerInvoice.getCustomerType()));
-        zyOrders.setInvoiceType(Integer.parseInt(customerInvoice.getInvoiceType()));
-        zyOrders.setTaxIdentificationNumber(customerInvoice.getTaxIdentificationNumber());
-        zyOrders.setAddressBilling(customerInvoice.getAddress());
-        zyOrders.setTelephone(customerInvoice.getTelephone());
-        zyOrders.setBankPublic(customerInvoice.getBankDeposit());
-        zyOrders.setAccountNumber(customerInvoice.getAccountNumber());
+        //顾客地址
+        if(zyOrdersJk.getAddressId()!=null&&zyOrdersJk.getAddressId()!="")
+        {
+            CustomerReceivingAddress customerReceivingAddress = customerReceivingAddressMapper.selectById(zyOrdersJk.getAddressId());
+            zyOrders.setCityId(customerReceivingAddress.getCityId());
+            zyOrders.setAddress(customerReceivingAddress.getAddress());
+            zyOrders.setZipCode(customerReceivingAddress.getZipCode());
+            zyOrders.setReceiver(zyOrdersJk.getReceiver());
+            zyOrders.setMobile(customerReceivingAddress.getMobile());
+        }
+
+        //顾客发票
+        if(zyOrdersJk.getInvoiceId()!=null&&zyOrdersJk.getInvoiceId()!="")
+        {
+            CustomerInvoice customerInvoice = customerInvoiceMapper.selectById(zyOrdersJk.getInvoiceId());
+            zyOrders.setInvoiceCustomerType(Integer.parseInt(customerInvoice.getCustomerType()));
+            zyOrders.setInvoiceType(Integer.parseInt(customerInvoice.getInvoiceType()));
+            zyOrders.setTaxIdentificationNumber(customerInvoice.getTaxIdentificationNumber());
+            zyOrders.setAddressBilling(customerInvoice.getAddress());
+            zyOrders.setTelephone(customerInvoice.getTelephone());
+            zyOrders.setBankPublic(customerInvoice.getBankDeposit());
+            zyOrders.setAccountNumber(customerInvoice.getAccountNumber());
+        }
+
         zyOrders.setSalesEnterpriseId(zyOrdersJk.getSalesEnterpriseId());
         zyOrders.setSalespersonId(zyOrdersJk.getSalespersonId());
         zyOrders.setLogisticsEnterprisesId(zyOrdersJk.getLogisticsEnterprisesId());
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
index 9739143d..94a16229 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
@@ -372,11 +372,20 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
             for (int i = 0; i < planProcessList.size(); i++) {
                 //第一个没有前导工序
                 if (i == 0) {
-                    ZyPlanProcess process1 = planProcessList.get(i);
-                    ZyPlanProcess process2 = planProcessList.get(i + 1);
-                    process1.setPostProcess(process2.getProcessId());
-                    process1.setPostProcessName(process2.getProcessName());
-                    updateList.add(process1);
+                    //判断是否有下到工序
+                    if(planProcessList.size()>1)
+                    {
+                        ZyPlanProcess process1 = planProcessList.get(i);
+                        ZyPlanProcess process2 = planProcessList.get(i + 1);
+                        process1.setPostProcess(process2.getProcessId());
+                        process1.setPostProcessName(process2.getProcessName());
+                        updateList.add(process1);
+                    }else
+                    {
+                        ZyPlanProcess process1 = planProcessList.get(i);
+                        updateList.add(process1);
+                    }
+
                 } else if (i > 0 && i < planProcessList.size() - 1) {
                     ZyPlanProcess process = planProcessList.get(i - 1);
                     ZyPlanProcess process1 = planProcessList.get(i);
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java
index b9855198..ff0b26cf 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java
@@ -137,7 +137,7 @@ public class ZyProductPlanServiceImpl extends ServiceImpl<ZyProductPlanMapper, Z
             SysDepart sysDepart = iSysDepartService.getById(zyProduct.getEnterprisesId());
             zyProductPlan.setProductOrg(StringUtils.isNotBlank(sysDepart.getDepartName()) ? sysDepart.getDepartName() : "");
         }
-        SysUser sysUser = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getRealname, zyProductPlan.getTeamLeader()));
+        SysUser sysUser = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, zyProductPlan.getTeamLeader()));
         zyProductPlan.setTeamLeader(sysUser.getUsername());
         zyProductPlan.setStatus(new Integer(ProductPlanStatusEnum.UNAUDITED.getCode()));
         this.save(zyProductPlan);

From 8e3c84145f3049611171a4d41f4dd6166db18651 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, 21 Apr 2023 18:17:26 +0800
Subject: [PATCH 4/6] 2023-04-21

---
 .../src/views/process/ZyProcessList.vue       |  927 ++++++-------
 .../service/impl/WorkOrderServiceImpl.java    | 1199 +++++++++--------
 2 files changed, 1092 insertions(+), 1034 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
index cb0d37f7..6760fffd 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
@@ -1,460 +1,469 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="服装类型">
-              <j-dict-select-tag placeholder="请选择服装款式" dictCode="zy_cloths_type,type_name,nums"
-                                 v-model="styleId"></j-dict-select-tag>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="工序代码">
-              <a-input placeholder="工序代码" v-model="processCode"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="工序名称">
-              <a-input placeholder="工序名称" v-model="processName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
-              <j-select-depart  v-model="enterpriseId" placeholder="请输入企业名称" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('zy_process')">导出</a-button>
-      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-      <!--        <a-button type="primary" icon="import">导入</a-button>-->
-      <!--      </a-upload>-->
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal"
-                     @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-           <a @click="fuzhi(record)">复制</a>
-
-          <a-divider type="vertical"/>
-            <a @click="dongzuo(record.id,record.processName)">动作</a>
-            <a-divider type="vertical"/>
-                <a @click="fuliao(record.id,record.processName)">面料</a>
-
-            <a-divider type="vertical"/>
-            <a @click="mianliao(record.id,record.processName)">辅料</a>
-            <a-divider type="vertical"/>
-             <a @click="shebei(record.id,record.processName)">设备</a>
-
-            <a-divider type="vertical"/>
-                 <a @click="gongju(record.id,record.processName)">工具</a>
-
-            <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="openDetail(record.id)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-        <!--        新建一个管理列-->
-        <!--        <span slot="action1" slot-scope="text, record">-->
-        <!--       -->
-        <!--        </span>-->
-      </a-table>
-    </div>
-    <ZyProcessDetail ref="zyProcessDetail"></ZyProcessDetail>
-    <zy-process-modal ref="modalForm" @ok="modalFormOk"></zy-process-modal>
-    <zy-process-modal1 ref="modalForm1" @ok="modalFormOk"></zy-process-modal1>
-    <zy-process-modal2 ref="modalForm2" @ok="modalFormOk"></zy-process-modal2>
-    <zy-process-modal3 ref="modalForm3" @ok="modalFormOk"></zy-process-modal3>
-    <zy-process-modal4 ref="modalForm4" @ok="modalFormOk"></zy-process-modal4>
-    <zy-process-modal5 ref="modalForm5" @ok="modalFormOk"></zy-process-modal5>
-  </a-card>
-</template>
-
-<script>
-
-import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-import ZyProcessModal from './modules/ZyProcessModal'
-import ZyProcessModal1 from './modules/ZyProcessModal1'
-import ZyProcessModal2 from './modules/ZyProcessModal2'
-import ZyProcessModal3 from './modules/ZyProcessModal3'
-import ZyProcessModal4 from './modules/ZyProcessModal4'
-import ZyProcessModal5 from './modules/ZyProcessModal5'
-import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-import ZyProcessDetail from './modules/ZyProcessDetail'
-import {getAction} from "@api/manage";
-import {filterObj} from "@/utils/util";
-
-export default {
-  name: 'ZyProcessList',
-  mixins: [JeecgListMixin, mixinDevice],
-  components: {
-    ZyProcessModal,
-    ZyProcessDetail,
-    ZyProcessModal1,
-    ZyProcessModal2,
-    ZyProcessModal3,
-    ZyProcessModal4,
-    ZyProcessModal5
-  },
-  data() {
-    return {
-      description: 'zy_process管理页面',
-      // 表头
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
-          }
-        },
-        {
-          title: '工序代码',
-          align: "center",
-          dataIndex: 'processCode'
-        },
-        {
-          title: '工序名称',
-          align: "center",
-          dataIndex: 'processName'
-        },
-        {
-          title: '企业',
-          align: "center",
-          dataIndex: 'enterpriseId_dictText'
-        },
-        {
-          title: '服装类型',
-          align: "center",
-          dataIndex: 'styleId_dictText'
-        },
-        // {
-        //   title:'工艺描述',
-        //   align:"center",
-        //   dataIndex: 'processDescribe'
-        // },
-        // {
-        //   title: '品质要求',
-        //   align: "center",
-        //   dataIndex: 'qualityRequire'
-        // },
-        {
-          title: '工序时间',
-          align: "center",
-          dataIndex: 'processTime'
-        },
-        {
-          title: '工序单价',
-          align: "center",
-          dataIndex: 'price'
-        },
-        {
-          title: '工序等级',
-          align: "center",
-          dataIndex: 'grade_dictText'
-        },
-        // {
-        //   title:'面料代码',
-        //   align:"center",
-        //   dataIndex: 'fabricNum'
-        // },
-        // {
-        //   title:'设备名',
-        //   align:"center",
-        //   dataIndex: 'machineId_dictText'
-        // },
-        // {
-        //   title:'部件',
-        //   align:"center",
-        //   dataIndex: 'componentId_dictText'
-        // },
-        // {
-        //   title:'工具名称',
-        //   align:"center",
-        //   dataIndex: 'toolId_dictText'
-        // },
-        // {
-        //   title: '款式名称',
-        //   align: "center",
-        //   dataIndex: 'styleId_dictText'
-        // },
-        {
-          title: '工段代码',
-          align: "center",
-          dataIndex: 'worksectionCode'
-        },
-        // {
-        //   title:'合同号',
-        //   align:"center",
-        //   dataIndex: 'contractNum'
-        // },
-        {
-          title: '合计（手工TMU）',
-          align: "center",
-          dataIndex: 'totalManualTmu'
-        },
-        {
-          title: '合计（机器TMU）',
-          align: "center",
-          dataIndex: 'totalMachineTmu'
-        },
-        {
-          title: '合计（手工秒）',
-          align: "center",
-          dataIndex: 'totalMaunal'
-        },
-        {
-          title: '合计（设备秒）',
-          align: "center",
-          dataIndex: 'totalMachine'
-        },
-
-
-        {
-          title: '创建时间',
-          align: "center",
-          dataIndex: 'createTime'
-        },
-        // {
-        //   title: '管理',
-        //   dataIndex: 'action1',
-        //   align:"center",
-        //   fixed:"right",
-        //   width:147,
-        //   scopedSlots: { customRender: 'action1' }
-        // },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align: "center",
-          fixed: "right",
-          width: 147,
-          scopedSlots: {customRender: 'action'}
-        }
-      ],
-      url: {
-        list: "/base/zyProcess/list",
-        delete: "/base/zyProcess/delete",
-        deleteBatch: "/base/zyProcess/deleteBatch",
-        exportXlsUrl: "/base/zyProcess/exportXls",
-        importExcelUrl: "base/zyProcess/importExcel",
-
-      },
-      //参数
-      loadRouteType: false,
-      styleId: "",
-      processCode:'',
-      processName:'',
-      enterpriseId:'',
-      dictOptions: {},
-      superFieldList: [],
-    }
-  },
-  created() {
-    // queryParam.styleId=this.styleId
-    //  this.getSuperFieldList();
-    this.loadParameter();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
-  },
-  methods: {
-    initDictConfig() {
-    },
-    //加载传递参数
-    loadParameter() {
-      if (this.loadRouteType == false) {
-        this.styleId = this.$route.query.styleId;
-        console.log(this.styleId)
-        this.loadRouteType = true;
-      }
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("请设置url.list属性!")
-        return
-      }
-      //加载数据 若传入参数1则加载第一页的内容
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.loadParameter();
-      var params = this.getQueryParams();//查询条件
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-          this.dataSource = res.result.records || res.result;
-          if (res.result.total) {
-            this.ipagination.total = res.result.total;
-          } else {
-            this.ipagination.total = 0;
-          }
-          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-        } else {
-          this.$message.warning(res.message)
-        }
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    getQueryParams() {
-      //获取查询条件
-      let sqp = {}
-      if (this.superQueryParams) {
-        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
-        sqp['superQueryMatchType'] = this.superQueryMatchType
-      }
-      var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
-      param.field = this.getQueryField();
-      param.pageNo = this.ipagination.current;
-      param.pageSize = this.ipagination.pageSize;
-      param.styleId = this.styleId;
-      param.enterpriseId=this.enterpriseId;
-      param.processCode=this.processCode;
-      param.processName=this.processName;
-      return filterObj(param);
-    },
-    searchReset() {
-      this.styleId = ''
-      this.processCode = ''
-      this.processName = ''
-      this.enterpriseId = ''
-      this.loadData(1);
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'processCode', text: '工序代码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'processName', text: '工序名称', dictCode: ''})
-      fieldList.push({type: 'string', value: 'processDescribe', text: '工艺描述', dictCode: ''})
-      fieldList.push({type: 'string', value: 'mkExplain', text: '做工说明', dictCode: ''})
-      fieldList.push({type: 'string', value: 'qualityRequire', text: '品质要求', dictCode: ''})
-      fieldList.push({type: 'string', value: 'processTime', text: '工序时间', dictCode: ''})
-      fieldList.push({type: 'double', value: 'price', text: '工序单价', dictCode: ''})
-      fieldList.push({type: 'string', value: 'grade', text: '工序等级', dictCode: ''})
-      fieldList.push({type: 'string', value: 'fabricNum', text: '面料代码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'fabricGrade', text: '面料等级', dictCode: ''})
-      fieldList.push({type: 'int', value: 'needlePitch', text: '针距（针/厘米）', dictCode: ''})
-      fieldList.push({type: 'string', value: 'machineId', text: '机器名', dictCode: 'zy_machine,name,id'})
-      fieldList.push({type: 'string', value: 'manualWide', text: '手工宽放', dictCode: ''})
-      fieldList.push({type: 'double', value: 'manualTime', text: '手工时间', dictCode: ''})
-      fieldList.push({type: 'int', value: 'machineSpeed', text: '机器转速', dictCode: ''})
-      fieldList.push({type: 'string', value: 'machineWide', text: '机器宽放', dictCode: ''})
-      fieldList.push({type: 'double', value: 'machineTime', text: '机器时间', dictCode: ''})
-      fieldList.push({type: 'string', value: 'machineFloat', text: '机器浮于', dictCode: ''})
-      fieldList.push({type: 'string', value: 'bundleWide', text: '绑包宽放', dictCode: ''})
-      fieldList.push({type: 'string', value: 'bundleTime', text: '绑包时间', dictCode: ''})
-      fieldList.push({type: 'string', value: 'componentId', text: '部件表', dictCode: 'zy_cloths_component,parts_name,id'})
-      fieldList.push({type: 'int', value: 'isBottleneck', text: '是否为瓶颈工序', dictCode: ''})
-      fieldList.push({type: 'string', value: 'enterpriseId', text: '企业名称', dictCode: ''})
-      fieldList.push({type: 'string', value: 'toolId', text: '工具名称', dictCode: 'zy_tool,name,id'})
-      fieldList.push({type: 'string', value: 'styleId', text: '款式名称', dictCode: ''})
-      fieldList.push({type: 'string', value: 'worksectionCode', text: '工段代码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'contractNum', text: '合同号', dictCode: ''})
-      fieldList.push({type: 'int', value: 'totalManualTmu', text: '合计（手工TMU）', dictCode: ''})
-      fieldList.push({type: 'int', value: 'totalMachineTmu', text: '合计（机器TMU）', dictCode: ''})
-      fieldList.push({type: 'int', value: 'totalMaunal', text: '合计（手工秒）', dictCode: ''})
-      fieldList.push({type: 'int', value: 'totalMachine', text: '合计（机器秒）', dictCode: ''})
-      fieldList.push({type: 'string', value: 'image', text: '图片', dictCode: ''})
-      fieldList.push({type: 'string', value: 'vedio', text: '视频', dictCode: ''})
-      this.superFieldList = fieldList
-    },
-    openDetail(id) {
-      this.$refs.zyProcessDetail.showModal(id)
-      // this.$children[0].showModal(id)
-    }
-  }
-}
-</script>
-<style scoped>
-@import '~@assets/less/common.less';
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="服装类型">
+              <j-dict-select-tag placeholder="请选择服装款式" dictCode="zy_cloths_type,type_name,nums"
+                                 v-model="styleId"></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="工序代码">
+              <a-input placeholder="工序代码" v-model="processCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="工序名称">
+              <a-input placeholder="工序名称" v-model="processName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
+              <j-select-depart  v-model="enterpriseId" placeholder="请输入企业名称" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('zy_process')">导出</a-button>
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal"
+                     @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt=""
+               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical"/>
+           <a @click="fuzhi(record)">复制</a>
+
+          <a-divider type="vertical"/>
+            <a @click="dongzuo(record.id,record.processName)">动作</a>
+            <a-divider type="vertical"/>
+                <a @click="fuliao(record.id,record.processName)">面料</a>
+
+            <a-divider type="vertical"/>
+            <a @click="mianliao(record.id,record.processName)">辅料</a>
+            <a-divider type="vertical"/>
+             <a @click="shebei(record.id,record.processName)">设备</a>
+
+            <a-divider type="vertical"/>
+                 <a @click="gongju(record.id,record.processName)">工具</a>
+
+            <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="openDetail(record.id)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+        <!--        新建一个管理列-->
+        <!--        <span slot="action1" slot-scope="text, record">-->
+        <!--       -->
+        <!--        </span>-->
+      </a-table>
+    </div>
+    <ZyProcessDetail ref="zyProcessDetail"></ZyProcessDetail>
+    <zy-process-modal ref="modalForm" @ok="modalFormOk"></zy-process-modal>
+    <zy-process-modal1 ref="modalForm1" @ok="modalFormOk"></zy-process-modal1>
+    <zy-process-modal2 ref="modalForm2" @ok="modalFormOk"></zy-process-modal2>
+    <zy-process-modal3 ref="modalForm3" @ok="modalFormOk"></zy-process-modal3>
+    <zy-process-modal4 ref="modalForm4" @ok="modalFormOk"></zy-process-modal4>
+    <zy-process-modal5 ref="modalForm5" @ok="modalFormOk"></zy-process-modal5>
+  </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import ZyProcessModal from './modules/ZyProcessModal'
+import ZyProcessModal1 from './modules/ZyProcessModal1'
+import ZyProcessModal2 from './modules/ZyProcessModal2'
+import ZyProcessModal3 from './modules/ZyProcessModal3'
+import ZyProcessModal4 from './modules/ZyProcessModal4'
+import ZyProcessModal5 from './modules/ZyProcessModal5'
+import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+import ZyProcessDetail from './modules/ZyProcessDetail'
+import {getAction} from "@api/manage";
+import {filterObj} from "@/utils/util";
+
+export default {
+  name: 'ZyProcessList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    ZyProcessModal,
+    ZyProcessDetail,
+    ZyProcessModal1,
+    ZyProcessModal2,
+    ZyProcessModal3,
+    ZyProcessModal4,
+    ZyProcessModal5
+  },
+  data() {
+    return {
+      description: 'zy_process管理页面',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: "center",
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1;
+          }
+        },
+        {
+          title: '工序代码',
+          align: "center",
+          dataIndex: 'processCode'
+        },
+        {
+          title: '工序名称',
+          align: "center",
+          dataIndex: 'processName'
+        },
+        {
+          title: '企业',
+          align: "center",
+          dataIndex: 'enterpriseId_dictText'
+        },
+        {
+          title: '服装类型',
+          align: "center",
+          dataIndex: 'styleId_dictText'
+        },
+        // {
+        //   title:'工艺描述',
+        //   align:"center",
+        //   dataIndex: 'processDescribe'
+        // },
+        // {
+        //   title: '品质要求',
+        //   align: "center",
+        //   dataIndex: 'qualityRequire'
+        // },
+        {
+          title: '工序时间',
+          align: "center",
+          dataIndex: 'processTime'
+        },
+        {
+          title: '工序单价',
+          align: "center",
+          dataIndex: 'price'
+        },
+        {
+          title: '工序等级',
+          align: "center",
+          dataIndex: 'grade_dictText'
+        },
+        // {
+        //   title:'面料代码',
+        //   align:"center",
+        //   dataIndex: 'fabricNum'
+        // },
+        // {
+        //   title:'设备名',
+        //   align:"center",
+        //   dataIndex: 'machineId_dictText'
+        // },
+        // {
+        //   title:'部件',
+        //   align:"center",
+        //   dataIndex: 'componentId_dictText'
+        // },
+        // {
+        //   title:'工具名称',
+        //   align:"center",
+        //   dataIndex: 'toolId_dictText'
+        // },
+        // {
+        //   title: '款式名称',
+        //   align: "center",
+        //   dataIndex: 'styleId_dictText'
+        // },
+        {
+          title: '工段代码',
+          align: "center",
+          dataIndex: 'worksectionCode'
+        },
+        // {
+        //   title:'合同号',
+        //   align:"center",
+        //   dataIndex: 'contractNum'
+        // },
+        {
+          title: '合计（手工TMU）',
+          align: "center",
+          dataIndex: 'totalManualTmu'
+        },
+        {
+          title: '合计（机器TMU）',
+          align: "center",
+          dataIndex: 'totalMachineTmu'
+        },
+        {
+          title: '合计（手工秒）',
+          align: "center",
+          dataIndex: 'totalMaunal'
+        },
+        {
+          title: '合计（设备秒）',
+          align: "center",
+          dataIndex: 'totalMachine'
+        },
+
+
+        {
+          title: '创建时间',
+          align: "center",
+          dataIndex: 'createTime'
+        },
+        // {
+        //   title: '管理',
+        //   dataIndex: 'action1',
+        //   align:"center",
+        //   fixed:"right",
+        //   width:147,
+        //   scopedSlots: { customRender: 'action1' }
+        // },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      url: {
+        list: "/base/zyProcess/list",
+        delete: "/base/zyProcess/delete",
+        deleteBatch: "/base/zyProcess/deleteBatch",
+        exportXlsUrl: "/base/zyProcess/exportXls",
+        importExcelUrl: "base/zyProcess/importExcel",
+
+      },
+      //参数
+      loadRouteType: false,
+      styleId: "",
+      processCode:'',
+      processName:'',
+      enterpriseId:'',
+      dictOptions: {},
+      superFieldList: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+
+    }
+  },
+  created() {
+    // queryParam.styleId=this.styleId
+    //  this.getSuperFieldList();
+    this.loadParameter();
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    initDictConfig() {
+    },
+    //加载传递参数
+    loadParameter() {
+      if (this.loadRouteType == false) {
+        this.styleId = this.$route.query.styleId;
+        console.log(this.styleId)
+        this.loadRouteType = true;
+      }
+    },
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      this.loadParameter();
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          this.dataSource = res.result.records || res.result;
+          if (res.result.total) {
+            this.ipagination.total = res.result.total;
+          } else {
+            this.ipagination.total = 0;
+          }
+          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    getQueryParams() {
+      //获取查询条件
+      let sqp = {}
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
+      }
+      var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      param.styleId = this.styleId;
+      param.enterpriseId=this.enterpriseId;
+      param.processCode=this.processCode;
+      param.processName=this.processName;
+      return filterObj(param);
+    },
+    searchReset() {
+      this.styleId = ''
+      this.processCode = ''
+      this.processName = ''
+      this.enterpriseId = ''
+      this.loadData(1);
+    },
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({type: 'string', value: 'processCode', text: '工序代码', dictCode: ''})
+      fieldList.push({type: 'string', value: 'processName', text: '工序名称', dictCode: ''})
+      fieldList.push({type: 'string', value: 'processDescribe', text: '工艺描述', dictCode: ''})
+      fieldList.push({type: 'string', value: 'mkExplain', text: '做工说明', dictCode: ''})
+      fieldList.push({type: 'string', value: 'qualityRequire', text: '品质要求', dictCode: ''})
+      fieldList.push({type: 'string', value: 'processTime', text: '工序时间', dictCode: ''})
+      fieldList.push({type: 'double', value: 'price', text: '工序单价', dictCode: ''})
+      fieldList.push({type: 'string', value: 'grade', text: '工序等级', dictCode: ''})
+      fieldList.push({type: 'string', value: 'fabricNum', text: '面料代码', dictCode: ''})
+      fieldList.push({type: 'string', value: 'fabricGrade', text: '面料等级', dictCode: ''})
+      fieldList.push({type: 'int', value: 'needlePitch', text: '针距（针/厘米）', dictCode: ''})
+      fieldList.push({type: 'string', value: 'machineId', text: '机器名', dictCode: 'zy_machine,name,id'})
+      fieldList.push({type: 'string', value: 'manualWide', text: '手工宽放', dictCode: ''})
+      fieldList.push({type: 'double', value: 'manualTime', text: '手工时间', dictCode: ''})
+      fieldList.push({type: 'int', value: 'machineSpeed', text: '机器转速', dictCode: ''})
+      fieldList.push({type: 'string', value: 'machineWide', text: '机器宽放', dictCode: ''})
+      fieldList.push({type: 'double', value: 'machineTime', text: '机器时间', dictCode: ''})
+      fieldList.push({type: 'string', value: 'machineFloat', text: '机器浮于', dictCode: ''})
+      fieldList.push({type: 'string', value: 'bundleWide', text: '绑包宽放', dictCode: ''})
+      fieldList.push({type: 'string', value: 'bundleTime', text: '绑包时间', dictCode: ''})
+      fieldList.push({type: 'string', value: 'componentId', text: '部件表', dictCode: 'zy_cloths_component,parts_name,id'})
+      fieldList.push({type: 'int', value: 'isBottleneck', text: '是否为瓶颈工序', dictCode: ''})
+      fieldList.push({type: 'string', value: 'enterpriseId', text: '企业名称', dictCode: ''})
+      fieldList.push({type: 'string', value: 'toolId', text: '工具名称', dictCode: 'zy_tool,name,id'})
+      fieldList.push({type: 'string', value: 'styleId', text: '款式名称', dictCode: ''})
+      fieldList.push({type: 'string', value: 'worksectionCode', text: '工段代码', dictCode: ''})
+      fieldList.push({type: 'string', value: 'contractNum', text: '合同号', dictCode: ''})
+      fieldList.push({type: 'int', value: 'totalManualTmu', text: '合计（手工TMU）', dictCode: ''})
+      fieldList.push({type: 'int', value: 'totalMachineTmu', text: '合计（机器TMU）', dictCode: ''})
+      fieldList.push({type: 'int', value: 'totalMaunal', text: '合计（手工秒）', dictCode: ''})
+      fieldList.push({type: 'int', value: 'totalMachine', text: '合计（机器秒）', dictCode: ''})
+      fieldList.push({type: 'string', value: 'image', text: '图片', dictCode: ''})
+      fieldList.push({type: 'string', value: 'vedio', text: '视频', dictCode: ''})
+      this.superFieldList = fieldList
+    },
+    openDetail(id) {
+      this.$refs.zyProcessDetail.showModal(id)
+      // this.$children[0].showModal(id)
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
 </style>
\ No newline at end of file
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 34571342..d0eef500 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
@@ -1,575 +1,624 @@
-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;
-import org.jeecg.modules.demo.base.mapper.ZyProcessMapper;
-import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
-import org.jeecg.modules.demo.customermeasure.mapper.CustomerMeasureMapper;
-import org.jeecg.modules.demo.ordergoods.entity.OrderGoods;
-import org.jeecg.modules.demo.ordergoods.mapper.OrderGoodsMapper;
-import org.jeecg.modules.demo.ordergoodsaccessories.entity.OrderGoodsAccessories;
-import org.jeecg.modules.demo.ordergoodsaccessories.mapper.OrderGoodsAccessoriesMapper;
-import org.jeecg.modules.demo.ordergoodsfabric.entity.OrderGoodsFabric;
-import org.jeecg.modules.demo.ordergoodsfabric.mapper.OrderGoodsFabricMapper;
-import org.jeecg.modules.demo.ordergoodsmodule.entity.OrderGoodsModule;
-import org.jeecg.modules.demo.ordergoodsmodule.mapper.OrderGoodsModuleMapper;
-import org.jeecg.modules.demo.pro.entity.ZyProcessAccessories;
-import org.jeecg.modules.demo.pro.entity.ZyProcessFabric;
-import org.jeecg.modules.demo.pro.entity.ZyProcessMachine;
-import org.jeecg.modules.demo.pro.mapper.ZyProcessMachineMapper;
-import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
-import org.jeecg.modules.demo.zyStyleModular.mapper.ZyStyleModularMapper;
-import org.jeecg.modules.demo.zyorders.entity.ZyOrders;
-import org.jeecg.modules.demo.zyorders.mapper.ZyOrdersMapper;
-import org.jeecg.modules.operationtool.entity.ZyOperationtool;
-import org.jeecg.modules.operationtool.mapper.ZyOperationtoolMapper;
-import org.jeecg.modules.product.pdaccessories.entity.ProductAccessories;
-import org.jeecg.modules.product.pdaccessories.mapper.ProductAccessoriesMapper;
-import org.jeecg.modules.product.pdfabric.entity.ProductFabric;
-import org.jeecg.modules.product.pdfabric.mapper.ProductFabricMapper;
-import org.jeecg.modules.product.pdmachine.entity.ProductMachine;
-import org.jeecg.modules.product.pdmachine.mapper.ProductMachineMapper;
-import org.jeecg.modules.product.pdoperationtool.entity.ProductOperationtool;
-import org.jeecg.modules.product.pdoperationtool.mapper.ProductOperationtoolMapper;
-import org.jeecg.modules.product.productModule.entity.ProductModule;
-import org.jeecg.modules.product.productModule.mapper.ProductModuleMapper;
-import org.jeecg.modules.product.zyproductprocess.entity.ZyProductProcess;
-import org.jeecg.modules.product.zyproductprocess.mapper.ZyProductProcessMapper;
-import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories;
-import org.jeecg.modules.productprocessaccessories.mapper.ProductProcessAccessoriesMapper;
-import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric;
-import org.jeecg.modules.productprocessfabric.mapper.ProductProcessFabricMapper;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.mapper.SysDepartMapper;
-import org.jeecg.modules.workorder.entity.WorkOrder;
-import org.jeecg.modules.workorder.entity.WorkOrderVo;
-import org.jeecg.modules.workorder.mapper.WorkOrderMapper;
-import org.jeecg.modules.workorder.service.IWorkOrderService;
-import org.jeecg.modules.workproduct.entity.ZyProduct;
-import org.jeecg.modules.workproduct.mapper.ZyProductMapper;
-import org.jeecg.modules.zyclothsample.entity.ZyClothSample;
-import org.jeecg.modules.zyclothsample.mapper.ZyClothSampleMapper;
-import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
-import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper;
-import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
-import org.jeecg.modules.zystylemodel.mapper.ZyStyleModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 工单订单完工
- * @Author: jeecg-boot
- * @Date:   2023-01-07
- * @Version: V1.0
- */
-@Service
-public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements IWorkOrderService {
-
-    //订单
-    @Autowired
-    private ZyOrdersMapper zyOrdersMapper;
-
-    //部门
-    @Autowired
-    private SysDepartMapper sysDepartMapper;
-
-    //订单商品
-    @Autowired
-    private OrderGoodsMapper orderGoodsMapper;
-
-    //服装款式表
-    @Autowired
-    private ZyClothsStyleMapper clothsStyleMapper;
-
-    //服装型号
-    @Autowired
-    private ZyStyleModelMapper styleModelMapper;
-
-    //成衣样板
-    @Autowired
-    private ZyClothSampleMapper clothSampleMapper;
-
-    //顾客测体
-    @Autowired
-    private CustomerMeasureMapper customerMeasureMapper;
-
-    //工单产品
-    @Autowired
-    private ZyProductMapper productMapper;
-
-    //服装工序
-    @Autowired
-    private ZyStyleModularMapper styleModularMapper;
-
-    //基本工序
-    @Autowired
-    private ZyProcessMapper processMapper;
-
-    //产品工序
-    @Autowired
-    private ZyProductProcessMapper productProcessMapper;
-
-    //工序工具
-    @Autowired
-    private ZyOperationtoolMapper zyOperationtoolMapper;
-    //产品工具
-    @Autowired
-    private ProductOperationtoolMapper productOperationtoolMapper;
-
-    //工序设备
-    @Autowired
-    private ZyProcessMachineMapper zyProcessMachine;
-    //产品设备
-    @Autowired
-    private ProductMachineMapper productMachineMapper;
-
-
-
-
-    //订单商品模块表
-    @Autowired
-    private OrderGoodsModuleMapper orderGoodsModuleMapper;
-    //产品模块
-    @Autowired
-    private ProductModuleMapper productModuleMapper;
-
-    //订单商品面料表
-    @Autowired
-    private OrderGoodsFabricMapper orderGoodsFabricMapper;
-    //产品面料表
-    @Autowired
-    private ProductFabricMapper productFabricMapper;
-
-    //订单商品辅料表
-    @Autowired
-    private OrderGoodsAccessoriesMapper orderGoodsAccessoriesMapper;
-    //产品辅料表
-    @Autowired
-    private ProductAccessoriesMapper productAccessoriesMapper;
-     //产品工序面料
-     @Autowired
-    private ProductProcessFabricMapper productProcessFabricMapper;
-    //产品工序辅料
-    @Autowired
-    private ProductProcessAccessoriesMapper productProcessAccessoriesMapper;
-
-    /**
-     * 自定义分页查询
-     * @param page
-     * @param workOrder
-     * @return
-     */
-    @Override
-    public IPage<WorkOrder> selectPage(Page<WorkOrder> page, WorkOrderVo workOrder) {
-        return baseMapper.selectListPage(page,workOrder);
-    }
-
-    /**
-     * 派单
-     * @param zyOrders
-     * @return
-     */
-    @Override
-    public Result<?> paidan(ZyOrders zyOrders,String depId) {
-        //订单ID
-        String orderId=zyOrders.getId();
-        //商品订单是否存在
-        QueryWrapper<OrderGoods> ogWrapper=new  QueryWrapper<OrderGoods>();
-        ogWrapper.eq("orders_id",orderId);
-        List<OrderGoods> ogList=orderGoodsMapper.selectList(ogWrapper);
-        //工单
-        WorkOrder workOrder=new WorkOrder();
-        if(ogList.size()>0)
-        {//start if 02
-            // 保存工单
-
-            //获取订单商品
-            OrderGoods ogModel=ogList.get(0);
-
-            //服装款式
-            //QueryWrapper<ZyClothsStyle> csWrapper=new  QueryWrapper<ZyClothsStyle>();
-            ZyClothsStyle csModel=clothsStyleMapper.selectById(ogModel.getStyleId());
-
-
-            //服装型号
-            //QueryWrapper<ZyStyleModel> sm=new  QueryWrapper<ZyStyleModel>();
-            ZyStyleModel smModel=styleModelMapper.selectById(ogModel.getModelId());
-            if(csModel==null ||smModel==null)
-            {
-                return Result.error("该订单服装型号或服装款式不存在,请检查后在操作!");
-            }
-            //得到结构图和排排料图
-            QueryWrapper<ZyClothSample> csWrapper=new  QueryWrapper<ZyClothSample>();
-            csWrapper.eq("style_id",ogModel.getStyleId());
-            csWrapper.eq("stylemodel_id",ogModel.getModelId());
-            //成衣样板
-            List<ZyClothSample>  csList=clothSampleMapper.selectList(csWrapper);
-            if(csList.size()<=0)
-            {
-                return Result.error("商品成衣样板不存在,请检查后在操作!");
-            }
-            ZyClothSample cSampleModel=csList.get(0);
-
-            //生成工单
-            int goodNum=ogModel.getGoodsNum();
-
-            workOrder.setProductCode(CreateWorkCode(csModel.getNums(),smModel.getModelNumber()));//工单编号
-            workOrder.setOrdersId(orderId);//订单id
-            workOrder.setOrderGoodsId(ogModel.getId());//	订单商品
-            workOrder.setGoodsNum(goodNum);//商品数量
-            workOrder.setOrderTime(zyOrders.getOrderTime());//下单时间
-            workOrder.setDeliveryTime(zyOrders.getDeliveryTime());//交货期
-            workOrder.setWorkOrderStatus(0);//工单状态
-            workOrder.setEnterprisesId(depId);//企业id
-            baseMapper.insert(workOrder);
-
-            //保存产品
-            if(goodNum>0)
-            {
-                //量体数据
-                CustomerMeasure mesureModel=customerMeasureMapper.selectById(ogModel.getMeasureId());
-                if(mesureModel==null) {
-                    return Result.error("未找到对客户量体数据！");
-                }
-
-                //#region 商品数量对应产品  保存产品
-                for(int i=0;i<goodNum;i++)
-                {
-                    ZyProduct productModel=new  ZyProduct();
-                    productModel.setProductName(ogModel.getGoodsName());
-                    productModel.setProductCode(CreateProductCode(workOrder.getProductCode()));//	产品编号
-                    productModel.setWorkOrderId(workOrder.getId());//_	工单id
-//							productModel.setProduceTime("");//	生产时间
-//							productModel.setTotalManualTmu("");//	合计（手工TMU）
-//							productModel.setTotalMachineTmu("");//	合计（设备TMU）
-//							productModel.setTotalMaunal("");//	合计（手工秒）
-//							productModel.setTotalMachine("");//	合计（设备秒）
-//							productModel.setEnterprisesId("");//_id	企业id
-                    productModel.setUserId(zyOrders.getUserId());//_id	用户id
-                    productModel.setStructureDiagram(cSampleModel.getStructureDiagram());//_diagram 结构图
-                    productModel.setLayoutDiagram(cSampleModel.getLayoutDiagram());//_diagram	排料图
-                    productModel.setProductPicture(cSampleModel.getUrl());//_picture	产品图片
-                    productModel.setHeight(mesureModel.getHeight());//	身高
-                    productModel.setWeight(mesureModel.getWeight());//	体重
-                    productModel.setHem(mesureModel.getHem());//	下摆
-                    productModel.setCuff(mesureModel.getCuff());//	袖口
-                    productModel.setSleeveLength(mesureModel.getSleeveLength());//_length	袖长
-                    productModel.setBust(mesureModel.getBust())	;//胸围
-                    productModel.setTheWaist(mesureModel.getTheWaist());//_waist	腰围
-                    productModel.setShoulderwidth(mesureModel.getShoulderWidth());// width	肩宽
-                    productModel.setForebodylength(mesureModel.getForebodyLength()) ;//length	前身长
-                    productModel.setNeck(mesureModel.getNeck());//	领围
-                    productModel.setHipline(mesureModel.getHipline());//	臀围
-                    productModel.setLength(mesureModel.getLength());//	衣长
-                    productModel.setSternalDistance(mesureModel.getSternalDistance());//distance	胸距
-                    productModel.setEnterprisesId(depId);//企业
-                    productMapper.insert(productModel);
-                    //产品模块、产品面料、产品辅料、产品工序、
-
-                    //#region 产品工序-添加（服装款式类型中读取）
-                    //根据服务款式表id 得到服装工序，然后在得到基本工序
-                    QueryWrapper<ZyStyleModular> styleModularLWrapper=new  QueryWrapper<ZyStyleModular>();
-                    styleModularLWrapper.eq("style_id",ogModel.getStyleId());
-                    List<ZyStyleModular>  zyStyleModularList=styleModularMapper.selectList(styleModularLWrapper);
-
-                    //将工序保存到产品工序中
-                    //List<ZyProductProcess> productProcessList=new ArrayList<>();
-                    for(ZyStyleModular item:zyStyleModularList)
-                    {
-                        ZyProductProcess zpp=new ZyProductProcess();
-                        zpp.setProductId(productModel.getId());//产品id
-                        zpp.setProcessId(item.getProcessId());//工序id
-                        zpp.setNumber(item.getSerialnumber());//序号
-                        productProcessMapper.insert(zpp);//保存
-
-                        //首先查询到对应的产品工序id，由于产品和工序对应应该唯一
-                         String productprocessId=productProcessMapper.findProductProcessId(zpp.getProductId(),zpp.getProcessId());
-                        //然后根据对应的工序id去基本工序关联的辅料和面料表中找到对应的数据
-                        //面料
-                        List<ZyProcessFabric> listFabric= productProcessMapper.findFabric(zpp.getProcessId());
-                        //辅料
-                        List<ZyProcessAccessories> listAccessories=productProcessMapper.findAccessories(zpp.getProcessId());
-                        //然后将产品工序id和辅料面料绑定
-                        //产品工序面料
-                        for (ZyProcessFabric zyProcessFabric : listFabric) {
-                            ProductProcessFabric fabric=new ProductProcessFabric();
-                            fabric.setFabricId(zyProcessFabric.getFabricId());
-                            fabric.setAmount(zyProcessFabric.getAmount());
-                            fabric.setProductProcessId(productprocessId);
-                            fabric.setId(null);
-                            productProcessFabricMapper.insert(fabric);
-                        }
-                        //产品工序辅料
-                        for (ZyProcessAccessories listAccessory : listAccessories) {
-                            ProductProcessAccessories accessories=new ProductProcessAccessories();
-                            accessories.setAccessoriesId(listAccessory.getAccessoriesId());
-                            accessories.setAmount(listAccessory.getAmount());
-                            accessories.setProductProcessId(productprocessId);
-                            accessories.setId(null);
-                            productProcessAccessoriesMapper.insert(accessories);
-                        }
-                        //ZyProcess =processMapper.selectById(item.getProcessId());
-
-                        //region 获取工序工具
-                        QueryWrapper<ZyOperationtool> operationtoolWrapper=new  QueryWrapper<ZyOperationtool>();
-                        //根据工序ID
-                        operationtoolWrapper.eq("operationid",item.getProcessId());
-                        List<ZyOperationtool> operationtoolList=zyOperationtoolMapper.selectList(operationtoolWrapper);
-                        int sort=1;
-                        for(ZyOperationtool itemTool:operationtoolList)
-                        {
-                            ProductOperationtool poModel=new ProductOperationtool();
-                            poModel.setProductId(productModel.getId());//产品id
-                            poModel.setOperationtoolId(itemTool.getToolid());//工具id
-
-                            poModel.setSort(sort++);//序号
-                            productOperationtoolMapper.insert(poModel);
-
-                        }
-                        //endregion
-
-                        //region 获取工序设备
-                        QueryWrapper<ZyProcessMachine> processMachineWrapper=new  QueryWrapper<ZyProcessMachine>();
-                        //根据工序ID
-                        processMachineWrapper.eq("process_id",item.getProcessId());
-                        List<ZyProcessMachine> processMachineList=zyProcessMachine.selectList(processMachineWrapper);
-                       //遍历设备
-                        sort=1;
-                        for(ZyProcessMachine itemMachine:processMachineList)
-                        {
-                            ProductMachine pmModel=new ProductMachine();
-                            pmModel.setProductId(productModel.getId());//产品id
-                            pmModel.setMachineId(itemMachine.getMachineId());//设备
-                            pmModel.setSort(sort++);//序号
-                            productMachineMapper.insert(pmModel);
-
-                        }
-                        //endregion
-
-                        //productProcessList.add(zpp);
-                    }
-                    //zyProductProcessService.save()
-                    //#endregion
-
-
-                    //#region 产品模块-添加（从订单中读取）
-                    //订单商品模块表-根据订单商品id
-                    QueryWrapper<OrderGoodsModule> productModuleWrapper=new  QueryWrapper<OrderGoodsModule>();
-                    productModuleWrapper.eq("order_goods_id",ogModel.getId());
-                    List<OrderGoodsModule>  orderGoodsModuleList=orderGoodsModuleMapper.selectList(productModuleWrapper);
-                    //循环保存
-                    List<ProductModule> ProductModuleList=new ArrayList<>();
-                    for(OrderGoodsModule item:orderGoodsModuleList)
-                    {
-                        ProductModule pmModel=new ProductModule();
-                        pmModel.setProductId(productModel.getId());//产品id
-                        pmModel.setStyleModuleId(item.getStyleModuleId());//款式模块id
-                        pmModel.setModuleId(item.getModuleId());//模块id
-                        //保存
-                        productModuleMapper.insert(pmModel);
-                        //ProductModuleList.add(pmModel);
-                    }
-
-                    //productModuleMapper.saveBatch(ProductModuleList);
-                    //#endregion
-
-                    //#region 产品面料-添加（从订单中读取）
-
-                    //订单商品面料表-根据订单商品id
-                    QueryWrapper<OrderGoodsFabric> ogFabricWrapper=new  QueryWrapper<OrderGoodsFabric>();
-                    ogFabricWrapper.eq("order_goods_id",ogModel.getId());
-                    List<OrderGoodsFabric>  orderGoodsFabricList=orderGoodsFabricMapper.selectList(ogFabricWrapper);
-                    //循环保存
-                    List<ProductFabric> productFabricList=new ArrayList<>();
-                    for(OrderGoodsFabric item:orderGoodsFabricList)
-                    {
-                        ProductFabric ptModel=new ProductFabric();
-                        ptModel.setProductId(productModel.getId());//产品id
-                        ptModel.setFabricId(item.getFabricId());//面料id
-                       // productFabricList.add(ptModel);
-                        //保存
-                        productFabricMapper.insert(ptModel);
-                    }
-                    //保存
-                   // productFabricMapper.saveBatch(productFabricList);
-                    //#endregion
-
-                    //#region 产品辅料-添加（从订单中读取）
-                    //订单商品辅料表-根据订单商品id
-                    QueryWrapper<OrderGoodsAccessories> ogAccessoriesWrapper=new  QueryWrapper<OrderGoodsAccessories>();
-                    ogAccessoriesWrapper.eq("order_goods_id",ogModel.getId());
-                    List<OrderGoodsAccessories>  orderGoodsAccessoriesList=orderGoodsAccessoriesMapper.selectList(ogAccessoriesWrapper);
-                    //循环保存
-                    List<ProductAccessories> productAccessoriesList=new ArrayList<>();
-                    for(OrderGoodsAccessories item:orderGoodsAccessoriesList)
-                    {
-                        ProductAccessories paModel=new ProductAccessories();
-                        paModel.setProductId(productModel.getId());//产品id
-                        paModel.setAccessoriesId(item.getAccessoriesId());//辅料id
-
-                        productAccessoriesMapper.insert(paModel);
-                       // productAccessoriesList.add(paModel);
-                    }
-                    //保存
-                   // productAccessoriesMapper.saveBatch(productAccessoriesList);
-                    //#endregion
-                }
-                //#endregion
-            }
-
-            else
-            {
-                return Result.error("订单商品数量小于0！");
-
-            }
-
-        }else//end if 02
-        {
-            return Result.error("订单商品数据未找到！");
-        }
-        //修改订单状态
-        zyOrders.setDeliveryStatus(3);
-        zyOrdersMapper.updateById(zyOrders);
-        return Result.OK("成功",workOrder);
-    }
-
-    /**
-     *  撤销工单
-     * @param woModel
-     * @return
-     */
-    @Override
-    public Result<?> cancellationWorkOrder(WorkOrder woModel) {
-        //根据工单获取产品列表，然后循环删除产品列表中的工序，以及工序对应的设备、工具，再删除产品中对应模块、面料、辅料
-
-        //工单
-        //-产品
-        QueryWrapper<ZyProduct> productWrapper = new QueryWrapper<ZyProduct>();
-        productWrapper.eq("work_order_id", woModel.getId());
-        List<ZyProduct> productList = productMapper.selectList(productWrapper);
-
-        for (ZyProduct model:productList)
-        {
-            //-工序
-            QueryWrapper<ZyProductProcess> productProcessWrapper = new QueryWrapper<ZyProductProcess>();
-            productProcessWrapper.eq("product_id",model.getId());
-            productProcessMapper.delete(productProcessWrapper);
-            //-工具
-            QueryWrapper<ProductOperationtool> productOperationtoolWrapper = new QueryWrapper<ProductOperationtool>();
-            productOperationtoolWrapper.eq("product_id",model.getId());
-            productOperationtoolMapper.delete(productOperationtoolWrapper);
-            //-设备
-            QueryWrapper<ProductMachine> productMachineWrapper = new QueryWrapper<ProductMachine>();
-            productMachineWrapper.eq("product_id",model.getId());
-            productMachineMapper.delete(productMachineWrapper);
-
-            //产品模块
-            QueryWrapper<ProductModule> productModuleWrapper = new QueryWrapper<ProductModule>();
-            productModuleWrapper.eq("product_id",model.getId());
-            productModuleMapper.delete(productModuleWrapper);
-
-            //产品面料
-            QueryWrapper<ProductFabric> productFabricWrapper = new QueryWrapper<ProductFabric>();
-            productFabricWrapper.eq("product_id",model.getId());
-            productFabricMapper.delete(productFabricWrapper);
-
-            //产品面料
-            QueryWrapper<ProductAccessories> productAccessoriesWrapper = new QueryWrapper<ProductAccessories>();
-            productAccessoriesWrapper.eq("product_id",model.getId());
-            productAccessoriesMapper.delete(productAccessoriesWrapper);
-        }
-
-
-        //修改订单
-        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("成功");
-    }
-
-    @Override
-    public List<String> jobPaidan(List<String> orderIds) {
-        //获取生产部门
-        QueryWrapper<SysDepart> queryWrapper=new QueryWrapper();
-        queryWrapper.eq("org_category",2);
-        List<SysDepart> sysDepList = sysDepartMapper.selectList(queryWrapper);
-        if(sysDepList.size()>0)
-        {
-
-            List<String> wordOderIds=new ArrayList<>();
-            //生产随机数，然后随机获取生产部门
-            int r=(int)Math.random() * sysDepList.size();
-            SysDepart dep=sysDepList.get(r);
-            for(String orderId:orderIds)
-            {
-                ZyOrders model=zyOrdersMapper.selectById(orderId);
-                Result result=this.paidan(model,dep.getId());
-                if (result.getCode().toString().equals("500"))
-                {
-                    return null;
-                }
-                WorkOrder wo=(WorkOrder)result.getResult();
-                wordOderIds.add(wo.getId());
-            }
-            return wordOderIds;
-        }
-        return null;
-    }
-
-
-    //生成工单编号
-
-    /**
-     *
-     * @param styleCode 款式编号
-     * @param modelCode 型号编号
-     * @return
-     */
-    private String CreateWorkCode(String styleCode,String modelCode)
-    {//编号规则：款式编号（10）+型号（4）+顺序号（8）
-        String mrstr = "00000000";
-        QueryWrapper<WorkOrder> query = new QueryWrapper<WorkOrder>();
-        int listsize = baseMapper.selectList(query).size();
-        int strsize = listsize+1;
-        String str = strsize+"";
-        int strlength = str.length();
-        String substr = mrstr.substring(0,mrstr.length()-strlength);
-        String workCode = styleCode+modelCode+substr+str;
-        return workCode;
-    }
-
-    /**
-     *
-     * @param workCode 工单编号
-     * @return
-     */
-    private String CreateProductCode(String workCode)
-    {//编号规则：工单编号（22）+顺序号（8）
-        String mrstr = "00000000";
-        QueryWrapper<ZyProduct> query = new QueryWrapper<ZyProduct>();
-        int listsize = productMapper.selectList(query).size();
-        int strsize = listsize+1;
-        String str = strsize+"";
-        int strlength = str.length();
-        String substr = mrstr.substring(0,mrstr.length()-strlength);
-        String produceCode = workCode+substr+str;
-        return produceCode;
-    }
-
-
-}
+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;
+import org.jeecg.modules.demo.base.mapper.ZyProcessMapper;
+import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
+import org.jeecg.modules.demo.customermeasure.mapper.CustomerMeasureMapper;
+import org.jeecg.modules.demo.ordergoods.entity.OrderGoods;
+import org.jeecg.modules.demo.ordergoods.mapper.OrderGoodsMapper;
+import org.jeecg.modules.demo.ordergoodsaccessories.entity.OrderGoodsAccessories;
+import org.jeecg.modules.demo.ordergoodsaccessories.mapper.OrderGoodsAccessoriesMapper;
+import org.jeecg.modules.demo.ordergoodsfabric.entity.OrderGoodsFabric;
+import org.jeecg.modules.demo.ordergoodsfabric.mapper.OrderGoodsFabricMapper;
+import org.jeecg.modules.demo.ordergoodsmodule.entity.OrderGoodsModule;
+import org.jeecg.modules.demo.ordergoodsmodule.mapper.OrderGoodsModuleMapper;
+import org.jeecg.modules.demo.pro.entity.ZyProcessAccessories;
+import org.jeecg.modules.demo.pro.entity.ZyProcessFabric;
+import org.jeecg.modules.demo.pro.entity.ZyProcessMachine;
+import org.jeecg.modules.demo.pro.mapper.ZyProcessMachineMapper;
+import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
+import org.jeecg.modules.demo.zyStyleModular.mapper.ZyStyleModularMapper;
+import org.jeecg.modules.demo.zyorders.entity.ZyOrders;
+import org.jeecg.modules.demo.zyorders.mapper.ZyOrdersMapper;
+import org.jeecg.modules.operationtool.entity.ZyOperationtool;
+import org.jeecg.modules.operationtool.mapper.ZyOperationtoolMapper;
+import org.jeecg.modules.product.pdaccessories.entity.ProductAccessories;
+import org.jeecg.modules.product.pdaccessories.mapper.ProductAccessoriesMapper;
+import org.jeecg.modules.product.pdfabric.entity.ProductFabric;
+import org.jeecg.modules.product.pdfabric.mapper.ProductFabricMapper;
+import org.jeecg.modules.product.pdmachine.entity.ProductMachine;
+import org.jeecg.modules.product.pdmachine.mapper.ProductMachineMapper;
+import org.jeecg.modules.product.pdoperationtool.entity.ProductOperationtool;
+import org.jeecg.modules.product.pdoperationtool.mapper.ProductOperationtoolMapper;
+import org.jeecg.modules.product.productModule.entity.ProductModule;
+import org.jeecg.modules.product.productModule.mapper.ProductModuleMapper;
+import org.jeecg.modules.product.zyproductprocess.entity.ZyProductProcess;
+import org.jeecg.modules.product.zyproductprocess.mapper.ZyProductProcessMapper;
+import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories;
+import org.jeecg.modules.productprocessaccessories.mapper.ProductProcessAccessoriesMapper;
+import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric;
+import org.jeecg.modules.productprocessfabric.mapper.ProductProcessFabricMapper;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.mapper.SysDepartMapper;
+import org.jeecg.modules.workorder.entity.WorkOrder;
+import org.jeecg.modules.workorder.entity.WorkOrderVo;
+import org.jeecg.modules.workorder.mapper.WorkOrderMapper;
+import org.jeecg.modules.workorder.service.IWorkOrderService;
+import org.jeecg.modules.workproduct.entity.ZyProduct;
+import org.jeecg.modules.workproduct.mapper.ZyProductMapper;
+import org.jeecg.modules.zyProcessModular.entity.ZyProcessModular;
+import org.jeecg.modules.zyProcessModular.mapper.ZyProcessModularMapper;
+import org.jeecg.modules.zyclothsample.entity.ZyClothSample;
+import org.jeecg.modules.zyclothsample.mapper.ZyClothSampleMapper;
+import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
+import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper;
+import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
+import org.jeecg.modules.zystylemodel.mapper.ZyStyleModelMapper;
+import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
+import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 工单订单完工
+ * @Author: jeecg-boot
+ * @Date:   2023-01-07
+ * @Version: V1.0
+ */
+@Service
+public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements IWorkOrderService {
+
+    //订单
+    @Autowired
+    private ZyOrdersMapper zyOrdersMapper;
+
+    //部门
+    @Autowired
+    private SysDepartMapper sysDepartMapper;
+
+    //订单商品
+    @Autowired
+    private OrderGoodsMapper orderGoodsMapper;
+
+    //服装款式表
+    @Autowired
+    private ZyClothsStyleMapper clothsStyleMapper;
+
+    //服装型号
+    @Autowired
+    private ZyStyleModelMapper styleModelMapper;
+
+    //成衣样板
+    @Autowired
+    private ZyClothSampleMapper clothSampleMapper;
+
+    //顾客测体
+    @Autowired
+    private CustomerMeasureMapper customerMeasureMapper;
+
+    //工单产品
+    @Autowired
+    private ZyProductMapper productMapper;
+
+    //服装工序
+    @Autowired
+    private ZyStyleModularMapper styleModularMapper;
+
+    //基本工序
+    @Autowired
+    private ZyProcessMapper processMapper;
+
+    //款式模块
+    @Autowired
+    private ZyStyleModuleMapper zyStyleModuleMapper;
+
+    //款式模块工序
+    @Autowired
+    private ZyProcessModularMapper zyProcessModularMapper;
+
+
+    //产品工序
+    @Autowired
+    private ZyProductProcessMapper productProcessMapper;
+
+
+
+    //工序工具
+    @Autowired
+    private ZyOperationtoolMapper zyOperationtoolMapper;
+    //产品工具
+    @Autowired
+    private ProductOperationtoolMapper productOperationtoolMapper;
+
+    //工序设备
+    @Autowired
+    private ZyProcessMachineMapper zyProcessMachine;
+    //产品设备
+    @Autowired
+    private ProductMachineMapper productMachineMapper;
+
+
+
+
+    //订单商品模块表
+    @Autowired
+    private OrderGoodsModuleMapper orderGoodsModuleMapper;
+    //产品模块
+    @Autowired
+    private ProductModuleMapper productModuleMapper;
+
+    //订单商品面料表
+    @Autowired
+    private OrderGoodsFabricMapper orderGoodsFabricMapper;
+    //产品面料表
+    @Autowired
+    private ProductFabricMapper productFabricMapper;
+
+    //订单商品辅料表
+    @Autowired
+    private OrderGoodsAccessoriesMapper orderGoodsAccessoriesMapper;
+    //产品辅料表
+    @Autowired
+    private ProductAccessoriesMapper productAccessoriesMapper;
+     //产品工序面料
+     @Autowired
+    private ProductProcessFabricMapper productProcessFabricMapper;
+    //产品工序辅料
+    @Autowired
+    private ProductProcessAccessoriesMapper productProcessAccessoriesMapper;
+
+    /**
+     * 自定义分页查询
+     * @param page
+     * @param workOrder
+     * @return
+     */
+    @Override
+    public IPage<WorkOrder> selectPage(Page<WorkOrder> page, WorkOrderVo workOrder) {
+        return baseMapper.selectListPage(page,workOrder);
+    }
+
+    /**
+     * 派单
+     * @param zyOrders
+     * @return
+     */
+    @Override
+    public Result<?> paidan(ZyOrders zyOrders,String depId) {
+        //订单ID
+        String orderId=zyOrders.getId();
+        //商品订单是否存在
+        QueryWrapper<OrderGoods> ogWrapper=new  QueryWrapper<OrderGoods>();
+        ogWrapper.eq("orders_id",orderId);
+        List<OrderGoods> ogList=orderGoodsMapper.selectList(ogWrapper);
+        //工单
+        WorkOrder workOrder=new WorkOrder();
+        if(ogList.size()>0)
+        {//start if 02
+            // 保存工单
+
+            //获取订单商品
+            OrderGoods ogModel=ogList.get(0);
+
+            //服装款式
+            //QueryWrapper<ZyClothsStyle> csWrapper=new  QueryWrapper<ZyClothsStyle>();
+            ZyClothsStyle csModel=clothsStyleMapper.selectById(ogModel.getStyleId());
+
+
+            //服装型号
+            //QueryWrapper<ZyStyleModel> sm=new  QueryWrapper<ZyStyleModel>();
+            ZyStyleModel smModel=styleModelMapper.selectById(ogModel.getModelId());
+            if(csModel==null ||smModel==null)
+            {
+                return Result.error("该订单服装型号或服装款式不存在,请检查后在操作!");
+            }
+            //得到结构图和排排料图
+            QueryWrapper<ZyClothSample> csWrapper=new  QueryWrapper<ZyClothSample>();
+            csWrapper.eq("style_id",ogModel.getStyleId());
+            csWrapper.eq("stylemodel_id",ogModel.getModelId());
+            //成衣样板
+            List<ZyClothSample>  csList=clothSampleMapper.selectList(csWrapper);
+            if(csList.size()<=0)
+            {
+                return Result.error("商品成衣样板不存在,请检查后在操作!");
+            }
+            ZyClothSample cSampleModel=csList.get(0);
+
+            //生成工单
+            int goodNum=ogModel.getGoodsNum();
+
+            workOrder.setProductCode(CreateWorkCode(csModel.getNums(),smModel.getModelNumber()));//工单编号
+            workOrder.setOrdersId(orderId);//订单id
+            workOrder.setOrderGoodsId(ogModel.getId());//	订单商品
+            workOrder.setGoodsNum(goodNum);//商品数量
+            workOrder.setOrderTime(zyOrders.getOrderTime());//下单时间
+            workOrder.setDeliveryTime(zyOrders.getDeliveryTime());//交货期
+            workOrder.setWorkOrderStatus(0);//工单状态
+            workOrder.setEnterprisesId(depId);//企业id
+            baseMapper.insert(workOrder);
+
+            //保存产品
+            if(goodNum>0)
+            {
+                //量体数据
+                CustomerMeasure mesureModel=customerMeasureMapper.selectById(ogModel.getMeasureId());
+                if(mesureModel==null) {
+                    return Result.error("未找到对客户量体数据！");
+                }
+
+                //#region 商品数量对应产品  保存产品
+                for(int i=0;i<goodNum;i++)
+                {
+                    ZyProduct productModel=new  ZyProduct();
+                    productModel.setProductName(ogModel.getGoodsName());
+                    productModel.setProductCode(CreateProductCode(workOrder.getProductCode()));//	产品编号
+                    productModel.setWorkOrderId(workOrder.getId());//_	工单id
+//							productModel.setProduceTime("");//	生产时间
+//							productModel.setTotalManualTmu("");//	合计（手工TMU）
+//							productModel.setTotalMachineTmu("");//	合计（设备TMU）
+//							productModel.setTotalMaunal("");//	合计（手工秒）
+//							productModel.setTotalMachine("");//	合计（设备秒）
+//							productModel.setEnterprisesId("");//_id	企业id
+                    productModel.setUserId(zyOrders.getUserId());//_id	用户id
+                    productModel.setStructureDiagram(cSampleModel.getStructureDiagram());//_diagram 结构图
+                    productModel.setLayoutDiagram(cSampleModel.getLayoutDiagram());//_diagram	排料图
+                    productModel.setProductPicture(cSampleModel.getUrl());//_picture	产品图片
+                    productModel.setHeight(mesureModel.getHeight());//	身高
+                    productModel.setWeight(mesureModel.getWeight());//	体重
+                    productModel.setHem(mesureModel.getHem());//	下摆
+                    productModel.setCuff(mesureModel.getCuff());//	袖口
+                    productModel.setSleeveLength(mesureModel.getSleeveLength());//_length	袖长
+                    productModel.setBust(mesureModel.getBust())	;//胸围
+                    productModel.setTheWaist(mesureModel.getTheWaist());//_waist	腰围
+                    productModel.setShoulderwidth(mesureModel.getShoulderWidth());// width	肩宽
+                    productModel.setForebodylength(mesureModel.getForebodyLength()) ;//length	前身长
+                    productModel.setNeck(mesureModel.getNeck());//	领围
+                    productModel.setHipline(mesureModel.getHipline());//	臀围
+                    productModel.setLength(mesureModel.getLength());//	衣长
+                    productModel.setSternalDistance(mesureModel.getSternalDistance());//distance	胸距
+                    productModel.setEnterprisesId(depId);//企业
+                    productMapper.insert(productModel);
+                    //产品模块、产品面料、产品辅料、产品工序、
+
+                    //#region 产品工序-添加（服装款式类型中读取）
+                    //工序有模块工序-和款式工序
+                    //根据服务款式表id 得到服装工序，然后在得到基本工序
+
+                    //款式工序
+                    QueryWrapper<ZyStyleModular> styleModularLWrapper=new  QueryWrapper<ZyStyleModular>();
+                    styleModularLWrapper.eq("style_id",ogModel.getStyleId());
+                    List<ZyStyleModular>  zyStyleModularList=styleModularMapper.selectList(styleModularLWrapper);
+
+                    List<ZyProductProcess> pplist=new ArrayList<>();
+                    //将款式工序保存到变量pplist中
+                    for(ZyStyleModular item:zyStyleModularList)
+                    {
+                        ZyProductProcess zpp=new ZyProductProcess();
+                        zpp.setProductId(productModel.getId());//产品id
+                        zpp.setProcessId(item.getProcessId());//工序id
+                        zpp.setNumber(item.getSerialnumber());//序号
+                        productProcessMapper.insert(zpp);//保存
+                        pplist.add(zpp);
+                    }
+
+                    //模块工序
+                    QueryWrapper<ZyStyleModule> qwStyleModule = new QueryWrapper<>();
+                    qwStyleModule.eq("style_id",ogModel.getStyleId());
+                    List<ZyStyleModule> smList=zyStyleModuleMapper.selectList(qwStyleModule);
+                    //将模块工序保存到变量pplist中
+                    for(ZyStyleModule item:smList)
+                    {
+                        //读取模块工序
+                        QueryWrapper<ZyProcessModular> qwProcessModular = new QueryWrapper<>();
+                        qwProcessModular.eq("modular_id",item.getModularId());
+                        List<ZyProcessModular> pmList=zyProcessModularMapper.selectList(qwProcessModular);
+                        for(ZyProcessModular pm:pmList)
+                        {
+                            ZyProductProcess zpp=new ZyProductProcess();
+                            zpp.setProductId(productModel.getId());//产品id
+                            zpp.setProcessId(pm.getProcessId());//工序id
+                            zpp.setNumber(pm.getSerialnumber());//序号
+                            productProcessMapper.insert(zpp);//保存
+                            pplist.add(zpp);
+                        }
+
+                    }
+
+
+                    //将工序保存到产品工序中
+                    //List<ZyProductProcess> productProcessList=new ArrayList<>();
+                    for(ZyProductProcess item:pplist)
+                    {
+
+                        //首先查询到对应的产品工序id，由于产品和工序对应应该唯一
+                         String productprocessId=productProcessMapper.findProductProcessId(item.getProductId(),item.getProcessId());
+                        //然后根据对应的工序id去基本工序关联的辅料和面料表中找到对应的数据
+                        //面料
+                        List<ZyProcessFabric> listFabric= productProcessMapper.findFabric(item.getProcessId());
+                        //辅料
+                        List<ZyProcessAccessories> listAccessories=productProcessMapper.findAccessories(item.getProcessId());
+                        //然后将产品工序id和辅料面料绑定
+                        //产品工序面料
+                        for (ZyProcessFabric zyProcessFabric : listFabric) {
+                            ProductProcessFabric fabric=new ProductProcessFabric();
+                            fabric.setFabricId(zyProcessFabric.getFabricId());
+                            fabric.setAmount(zyProcessFabric.getAmount());
+                            fabric.setProductProcessId(productprocessId);
+                            fabric.setId(null);
+                            productProcessFabricMapper.insert(fabric);
+                        }
+                        //产品工序辅料
+                        for (ZyProcessAccessories listAccessory : listAccessories) {
+                            ProductProcessAccessories accessories=new ProductProcessAccessories();
+                            accessories.setAccessoriesId(listAccessory.getAccessoriesId());
+                            accessories.setAmount(listAccessory.getAmount());
+                            accessories.setProductProcessId(productprocessId);
+                            accessories.setId(null);
+                            productProcessAccessoriesMapper.insert(accessories);
+                        }
+                        //ZyProcess =processMapper.selectById(item.getProcessId());
+
+                        //region 获取工序工具
+                        QueryWrapper<ZyOperationtool> operationtoolWrapper=new  QueryWrapper<ZyOperationtool>();
+                        //根据工序ID
+                        operationtoolWrapper.eq("operationid",item.getProcessId());
+                        List<ZyOperationtool> operationtoolList=zyOperationtoolMapper.selectList(operationtoolWrapper);
+                        int sort=1;
+                        for(ZyOperationtool itemTool:operationtoolList)
+                        {
+                            ProductOperationtool poModel=new ProductOperationtool();
+                            poModel.setProductId(productModel.getId());//产品id
+                            poModel.setOperationtoolId(itemTool.getToolid());//工具id
+
+                            poModel.setSort(sort++);//序号
+                            productOperationtoolMapper.insert(poModel);
+
+                        }
+                        //endregion
+
+                        //region 获取工序设备
+                        QueryWrapper<ZyProcessMachine> processMachineWrapper=new  QueryWrapper<ZyProcessMachine>();
+                        //根据工序ID
+                        processMachineWrapper.eq("process_id",item.getProcessId());
+                        List<ZyProcessMachine> processMachineList=zyProcessMachine.selectList(processMachineWrapper);
+                       //遍历设备
+                        sort=1;
+                        for(ZyProcessMachine itemMachine:processMachineList)
+                        {
+                            ProductMachine pmModel=new ProductMachine();
+                            pmModel.setProductId(productModel.getId());//产品id
+                            pmModel.setMachineId(itemMachine.getMachineId());//设备
+                            pmModel.setSort(sort++);//序号
+                            productMachineMapper.insert(pmModel);
+
+                        }
+                        //endregion
+
+                        //productProcessList.add(zpp);
+                    }
+                    //zyProductProcessService.save()
+                    //#endregion
+
+
+                    //#region 产品模块-添加（从订单中读取）
+                    //订单商品模块表-根据订单商品id
+                    QueryWrapper<OrderGoodsModule> productModuleWrapper=new  QueryWrapper<OrderGoodsModule>();
+                    productModuleWrapper.eq("order_goods_id",ogModel.getId());
+                    List<OrderGoodsModule>  orderGoodsModuleList=orderGoodsModuleMapper.selectList(productModuleWrapper);
+                    //循环保存
+                    List<ProductModule> ProductModuleList=new ArrayList<>();
+                    for(OrderGoodsModule item:orderGoodsModuleList)
+                    {
+                        ProductModule pmModel=new ProductModule();
+                        pmModel.setProductId(productModel.getId());//产品id
+                        pmModel.setStyleModuleId(item.getStyleModuleId());//款式模块id
+                        pmModel.setModuleId(item.getModuleId());//模块id
+                        //保存
+                        productModuleMapper.insert(pmModel);
+                        //ProductModuleList.add(pmModel);
+                    }
+
+                    //productModuleMapper.saveBatch(ProductModuleList);
+                    //#endregion
+
+                    //#region 产品面料-添加（从订单中读取）
+
+                    //订单商品面料表-根据订单商品id
+                    QueryWrapper<OrderGoodsFabric> ogFabricWrapper=new  QueryWrapper<OrderGoodsFabric>();
+                    ogFabricWrapper.eq("order_goods_id",ogModel.getId());
+                    List<OrderGoodsFabric>  orderGoodsFabricList=orderGoodsFabricMapper.selectList(ogFabricWrapper);
+                    //循环保存
+                    List<ProductFabric> productFabricList=new ArrayList<>();
+                    for(OrderGoodsFabric item:orderGoodsFabricList)
+                    {
+                        ProductFabric ptModel=new ProductFabric();
+                        ptModel.setProductId(productModel.getId());//产品id
+                        ptModel.setFabricId(item.getFabricId());//面料id
+                       // productFabricList.add(ptModel);
+                        //保存
+                        productFabricMapper.insert(ptModel);
+                    }
+                    //保存
+                   // productFabricMapper.saveBatch(productFabricList);
+                    //#endregion
+
+                    //#region 产品辅料-添加（从订单中读取）
+                    //订单商品辅料表-根据订单商品id
+                    QueryWrapper<OrderGoodsAccessories> ogAccessoriesWrapper=new  QueryWrapper<OrderGoodsAccessories>();
+                    ogAccessoriesWrapper.eq("order_goods_id",ogModel.getId());
+                    List<OrderGoodsAccessories>  orderGoodsAccessoriesList=orderGoodsAccessoriesMapper.selectList(ogAccessoriesWrapper);
+                    //循环保存
+                    List<ProductAccessories> productAccessoriesList=new ArrayList<>();
+                    for(OrderGoodsAccessories item:orderGoodsAccessoriesList)
+                    {
+                        ProductAccessories paModel=new ProductAccessories();
+                        paModel.setProductId(productModel.getId());//产品id
+                        paModel.setAccessoriesId(item.getAccessoriesId());//辅料id
+
+                        productAccessoriesMapper.insert(paModel);
+                       // productAccessoriesList.add(paModel);
+                    }
+                    //保存
+                   // productAccessoriesMapper.saveBatch(productAccessoriesList);
+                    //#endregion
+                }
+                //#endregion
+            }
+
+            else
+            {
+                return Result.error("订单商品数量小于0！");
+
+            }
+
+        }else//end if 02
+        {
+            return Result.error("订单商品数据未找到！");
+        }
+        //修改订单状态
+        zyOrders.setDeliveryStatus(3);
+        zyOrdersMapper.updateById(zyOrders);
+        return Result.OK("成功",workOrder);
+    }
+
+    /**
+     *  撤销工单
+     * @param woModel
+     * @return
+     */
+    @Override
+    public Result<?> cancellationWorkOrder(WorkOrder woModel) {
+        //根据工单获取产品列表，然后循环删除产品列表中的工序，以及工序对应的设备、工具，再删除产品中对应模块、面料、辅料
+
+        //工单
+        //-产品
+        QueryWrapper<ZyProduct> productWrapper = new QueryWrapper<ZyProduct>();
+        productWrapper.eq("work_order_id", woModel.getId());
+        List<ZyProduct> productList = productMapper.selectList(productWrapper);
+
+        for (ZyProduct model:productList)
+        {
+            //-工序
+            QueryWrapper<ZyProductProcess> productProcessWrapper = new QueryWrapper<ZyProductProcess>();
+            productProcessWrapper.eq("product_id",model.getId());
+            productProcessMapper.delete(productProcessWrapper);
+            //-工具
+            QueryWrapper<ProductOperationtool> productOperationtoolWrapper = new QueryWrapper<ProductOperationtool>();
+            productOperationtoolWrapper.eq("product_id",model.getId());
+            productOperationtoolMapper.delete(productOperationtoolWrapper);
+            //-设备
+            QueryWrapper<ProductMachine> productMachineWrapper = new QueryWrapper<ProductMachine>();
+            productMachineWrapper.eq("product_id",model.getId());
+            productMachineMapper.delete(productMachineWrapper);
+
+            //产品模块
+            QueryWrapper<ProductModule> productModuleWrapper = new QueryWrapper<ProductModule>();
+            productModuleWrapper.eq("product_id",model.getId());
+            productModuleMapper.delete(productModuleWrapper);
+
+            //产品面料
+            QueryWrapper<ProductFabric> productFabricWrapper = new QueryWrapper<ProductFabric>();
+            productFabricWrapper.eq("product_id",model.getId());
+            productFabricMapper.delete(productFabricWrapper);
+
+            //产品面料
+            QueryWrapper<ProductAccessories> productAccessoriesWrapper = new QueryWrapper<ProductAccessories>();
+            productAccessoriesWrapper.eq("product_id",model.getId());
+            productAccessoriesMapper.delete(productAccessoriesWrapper);
+        }
+
+
+        //修改订单
+        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("成功");
+    }
+
+    @Override
+    public List<String> jobPaidan(List<String> orderIds) {
+        //获取生产部门
+        QueryWrapper<SysDepart> queryWrapper=new QueryWrapper();
+        queryWrapper.eq("org_category",2);
+        List<SysDepart> sysDepList = sysDepartMapper.selectList(queryWrapper);
+        if(sysDepList.size()>0)
+        {
+
+            List<String> wordOderIds=new ArrayList<>();
+            //生产随机数，然后随机获取生产部门
+            int r=(int)Math.random() * sysDepList.size();
+            SysDepart dep=sysDepList.get(r);
+            for(String orderId:orderIds)
+            {
+                ZyOrders model=zyOrdersMapper.selectById(orderId);
+                Result result=this.paidan(model,dep.getId());
+                if (result.getCode().toString().equals("500"))
+                {
+                    return null;
+                }
+                WorkOrder wo=(WorkOrder)result.getResult();
+                wordOderIds.add(wo.getId());
+            }
+            return wordOderIds;
+        }
+        return null;
+    }
+
+
+    //生成工单编号
+
+    /**
+     *
+     * @param styleCode 款式编号
+     * @param modelCode 型号编号
+     * @return
+     */
+    private String CreateWorkCode(String styleCode,String modelCode)
+    {//编号规则：款式编号（10）+型号（4）+顺序号（8）
+        String mrstr = "00000000";
+        QueryWrapper<WorkOrder> query = new QueryWrapper<WorkOrder>();
+        int listsize = baseMapper.selectList(query).size();
+        int strsize = listsize+1;
+        String str = strsize+"";
+        int strlength = str.length();
+        String substr = mrstr.substring(0,mrstr.length()-strlength);
+        String workCode = styleCode+modelCode+substr+str;
+        return workCode;
+    }
+
+    /**
+     *
+     * @param workCode 工单编号
+     * @return
+     */
+    private String CreateProductCode(String workCode)
+    {//编号规则：工单编号（22）+顺序号（8）
+        String mrstr = "00000000";
+        QueryWrapper<ZyProduct> query = new QueryWrapper<ZyProduct>();
+        int listsize = productMapper.selectList(query).size();
+        int strsize = listsize+1;
+        String str = strsize+"";
+        int strlength = str.length();
+        String substr = mrstr.substring(0,mrstr.length()-strlength);
+        String produceCode = workCode+substr+str;
+        return produceCode;
+    }
+
+
+}

From 43200f64b49be19275d32c0b75d0df033da57adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com>
Date: Mon, 24 Apr 2023 09:31:14 +0800
Subject: [PATCH 5/6] 2023-0424

---
 jeecg-boot/jeecg-boot-module-system/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml
index 878549cc..f5d0e640 100644
--- a/jeecg-boot/jeecg-boot-module-system/pom.xml
+++ b/jeecg-boot/jeecg-boot-module-system/pom.xml
@@ -135,10 +135,10 @@
             <version>5.2.4.RELEASE</version>
         </dependency>
 		<!-- 引入定时任务依赖 -->
-<!--		<dependency>-->
-<!--			<groupId>org.jeecgframework.boot</groupId>-->
-<!--			<artifactId>jeecg-boot-starter-job</artifactId>-->
-<!--		</dependency>-->
+		<dependency>
+			<groupId>org.jeecgframework.boot</groupId>
+			<artifactId>jeecg-boot-starter-job</artifactId>
+		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.jacob/jacob 语音合成 -->
 		<dependency>

From 3b5d71f42c93c5d1be2154b0ccbf1d03b4075b40 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Mon, 24 Apr 2023 09:34:56 +0800
Subject: [PATCH 6/6] bug

---
 .../src/views/erp/accessories/ZyAccessoriesList.vue |  4 ++--
 .../erp/accessories/modules/ZyAccessoriesForm.vue   |  2 +-
 .../controller/ZyAccessoriesController.java         | 13 +++++++------
 .../demo/accessories/entity/ZyAccessories.java      |  6 +++++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
index 88341d34..09023f5f 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
@@ -84,9 +84,9 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-<!--          <a @click="handleEdit(record)">编辑</a>-->
+          <a @click="handleEdit(record)">编辑</a>
 
-<!--          <a-divider type="vertical" />-->
+          <a-divider type="vertical" />
 <!--     -->
 
                 <a @click="handleDetail(record.id)">详情</a>
diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
index 800d65bf..809f860c 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
@@ -8,7 +8,7 @@
               <j-popup
                 v-model="model.typeName"
                 field="typeName"
-                org-fields="nums,contents"
+                org-fields="id,contents"
                 dest-fields="typeId,typeName"
                 code="zy_accessories_type"
                 :multi="false"
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java
index 7d468284..72146c01 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java
@@ -50,7 +50,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyAccessoriesService> {
 	@Autowired
 	private IZyAccessoriesService zyAccessoriesService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -73,7 +73,7 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
 		IPage<ZyAccessories> pageList = zyAccessoriesService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -93,7 +93,7 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
 		zyAccessoriesService.save(zyAccessories);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -106,6 +106,7 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
 	public Result<?> edit(@RequestBody ZyAccessories zyAccessories) {
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("contents",zyAccessories.getContents());
+		queryWrapper.ne("id",zyAccessories.getId());
 		int a= zyAccessoriesService.count(queryWrapper);
 		if(a>=1){
 			return Result.error("名称重复，请修改后重试！！");
@@ -113,7 +114,7 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
 		zyAccessoriesService.updateById(zyAccessories);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -127,7 +128,7 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
 		zyAccessoriesService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -141,7 +142,7 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
 		this.zyAccessoriesService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
index 8572c149..82f13f73 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
@@ -38,8 +38,12 @@ public class ZyAccessories implements Serializable {
 	/**类型id*/
 	@Excel(name = "类型id", width = 15)
     @ApiModelProperty(value = "类型id")
-    @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "nums")
+    @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id")
     private java.lang.String typeId;
+    /**类型名称*/
+    @Excel(name = "类型名称", width = 15)
+    @ApiModelProperty(value = "类型名称")
+    private java.lang.String typeName;
 	/**编号*/
 	@Excel(name = "编号", width = 15)
     @ApiModelProperty(value = "编号")