From 484b0f1ffeb7ed9c6280c57298493326bdd3e7c9 Mon Sep 17 00:00:00 2001
From: lenovo <123>
Date: Sat, 3 Dec 2022 14:50:51 +0800
Subject: [PATCH 1/6] =?UTF-8?q?2022-12-3=E5=B7=A5=E5=BA=8F=E5=B5=8C?=
 =?UTF-8?q?=E5=A5=97=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/modules/ZyClothActionForm.vue     |  27 ++-
 .../process/modules/ZyOperationtoolList.vue   |  14 +-
 .../process/modules/ZyOperationtoolModal.vue  |  94 ++++++++
 .../modules/ZyProcessAccessoriesList.vue      |  15 +-
 .../modules/ZyProcessAccessoriesModal.vue     |  94 ++++++++
 .../process/modules/ZyProcessActionList.vue   |  38 +++-
 .../process/modules/ZyProcessActionModal.vue  |  60 +++--
 .../process/modules/ZyProcessFabricList.vue   |  15 +-
 .../process/modules/ZyProcessFabricModal.vue  |  94 ++++++++
 .../process/modules/ZyProcessMachineList.vue  |  15 +-
 .../process/modules/ZyProcessMachineModal.vue |  84 +++++++
 .../modules/list/ZyAccessoriesList.vue        | 159 +++++++++++++
 .../modules/list/ZyClothActionList.vue        | 214 ++++++++++++++++++
 .../process/modules/list/ZyFabricList.vue     | 196 ++++++++++++++++
 .../views/process/modules/list/ZyMachine.vue  | 193 ++++++++++++++++
 .../views/process/modules/list/ZyToolList.vue | 154 +++++++++++++
 .../controller/ZyClothActionController.java   |   5 +
 .../modules/demo/base/entity/ZyProcess.java   |   2 +-
 .../demo/base/mapper/ZyClothActionMapper.java |   3 +
 .../base/service/IZyClothActionService.java   |   1 +
 .../impl/ZyClothActionServiceImpl.java        |   7 +
 .../ZyProcessAccessoriesController.java       |   8 +-
 .../controller/ZyProcessActionController.java |  36 ++-
 .../controller/ZyProcessFabricController.java |   8 +-
 .../ZyProcessMachineController.java           |   8 +-
 .../pro/mapper/ZyProcessActionMapper.java     |   9 +
 .../pro/service/IZyProcessActionService.java  |   6 +
 .../impl/ZyProcessActionServiceImpl.java      |  15 ++
 .../controller/ZyDevicetypeController.java    |  12 +
 .../controller/ZyOperationtoolController.java |   9 +-
 .../mapper/ZyOperationtoolMapper.java         |   2 +-
 31 files changed, 1516 insertions(+), 81 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/list/ZyAccessoriesList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/list/ZyClothActionList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/list/ZyFabricList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/list/ZyToolList.vue

diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
index e49d3bf7..e56374db 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
@@ -8,6 +8,11 @@
 <!--              <a-input v-model="model.addPeople" placeholder="请输入添加人"  ></a-input>-->
 <!--            </a-form-model-item>-->
 <!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
+              <a-input v-model="model.nums" placeholder="请输入编号"  disabled></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="频率" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="freq">
               <a-input-number v-model="model.freq" placeholder="请输入频率" style="width: 100%" />
@@ -28,11 +33,7 @@
               <a-input-number v-model="model.manualTmu" placeholder="请输入手工TMU" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
-              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
+
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -60,6 +61,7 @@
       return {
         model:{
           addPeople:'',
+          nums:'',
          },
         labelCol: {
           xs: { span: 24 },
@@ -88,7 +90,8 @@
         url: {
           add: "/base/zyClothAction/add",
           edit: "/base/zyClothAction/edit",
-          queryById: "/base/zyClothAction/queryById"
+          queryById: "/base/zyClothAction/queryById",
+          sort:"/base/zyClothAction/sort"
         }
       }
     },
@@ -100,7 +103,17 @@
     created () {
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
-
+      var n=5
+      getAction(this.url.sort,null).then((res)=>{
+        // console.log(res.message)
+        var num=parseInt(res.message,10)+1
+        num=num.toString()
+        while(num.length<n){
+          num="0"+num
+        }
+        this.model.nums="M"+num;
+        // console.log(this.model.nums)
+      })
     },
     methods: {
       add () {
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue
index 434671d1..9f62c1b2 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue
@@ -5,7 +5,7 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :sm="5">
-            <a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
+            <a-form-model-item label="工具" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
               <a-input v-model="queryParam.toolid" placeholder="请输入工具名称"  ></a-input>
             </a-form-model-item>
           </a-col>
@@ -79,12 +79,7 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit1(record,code)">编辑</a>
 
-          <a-divider type="vertical" />
-
-                <a @click="handleDetail(record)">详情</a>
-               <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -94,7 +89,7 @@
       </a-table>
     </div>
 
-    <zy-operationtool-modal ref="modalForm" @ok="modalFormOk"></zy-operationtool-modal>
+    <zy-operationtool-modal   @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-operationtool-modal>
   </a-card>
 </template>
 
@@ -103,7 +98,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ZyOperationtoolModal from "@/views/operationtool/modules/ZyOperationtoolModal"
+  import ZyOperationtoolModal from "./ZyOperationtoolModal"
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
@@ -196,6 +191,9 @@
       },
       initDictConfig(){
       },
+      valueChange(value){
+        if (value) this.loadData()
+      },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'operationid',text:'工序',dictCode:'zy_process,process_name,id'})
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolModal.vue
new file mode 100644
index 00000000..5917a9db
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolModal.vue
@@ -0,0 +1,94 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+<!--    <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
+   <zy-tool-list ref="realForm"   @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-tool-list>
+  </j-modal>
+</template>
+
+<script>
+
+
+  import {postAction} from "../../../api/manage";
+  import ZyToolList from "./list/ZyToolList";
+  export default {
+    name: 'ZyToolModal',
+    components: {
+      ZyToolList,
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        model:{
+          operationid:'',
+          toolid:'',
+        },
+        url:{
+          add:"/operationtool/zyOperationtool/add"
+        }
+      }
+    },
+    methods: {
+      // add () {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.add();
+      //   })
+      // },
+      add1 (id) {
+        this.visible=true
+        this.$nextTick(()=>{
+          // this.$refs.realForm.add1(id);
+          this.model.operationid=id;
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      // edit1 (record,code) {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.edit1(record,code);
+      //   })
+      // },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      chuancan(res){
+        this.model.toolid=res;
+      },
+      handleOk () {
+        postAction(this.url.add,this.model).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+          this.$emit('valueChange',1)
+          this.close()
+
+        })},
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
index b8027c32..bed9aef8 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
@@ -79,13 +79,13 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit1(record,code)">编辑</a>
+<!--          <a @click="handleEdit1(record,code)">编辑</a>-->
 
-          <a-divider type="vertical" />
+<!--          <a-divider type="vertical" />-->
 
 
-                <a @click="handleDetail(record)">详情</a>
-        <a-divider type="vertical" />
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--        <a-divider type="vertical" />-->
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -95,7 +95,7 @@
       </a-table>
     </div>
 
-    <zy-process-accessories-modal ref="modalForm" @ok="modalFormOk"></zy-process-accessories-modal>
+    <zy-process-accessories-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-accessories-modal>
   </a-card>
 </template>
 
@@ -104,7 +104,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ZyProcessAccessoriesModal from '@/views/cloths/modules/ZyProcessAccessoriesModal'
+  import ZyProcessAccessoriesModal from './ZyProcessAccessoriesModal'
 
   export default {
     name: 'ZyProcessAccessoriesList',
@@ -195,6 +195,9 @@
         this.visible = true;
 
       },
+      valueChange(value){
+        if (value) this.loadData()
+      },
       initDictConfig(){
       },
       getSuperFieldList(){
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesModal.vue
new file mode 100644
index 00000000..8e1883c8
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesModal.vue
@@ -0,0 +1,94 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+<!--    <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
+   <zy-accessories-list ref="realForm"   @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-accessories-list>
+  </j-modal>
+</template>
+
+<script>
+
+
+  import {postAction} from "../../../api/manage";
+  import ZyAccessoriesList from "./list/ZyAccessoriesList";
+  export default {
+    name: 'ZyProcessActionModal',
+    components: {
+      ZyAccessoriesList,
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        model:{
+          processId:'',
+          accessoriesId:'',
+        },
+        url:{
+          add:"/pro/zyProcessAccessories/add"
+        }
+      }
+    },
+    methods: {
+      // add () {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.add();
+      //   })
+      // },
+      add1 (id) {
+        this.visible=true
+        this.$nextTick(()=>{
+          // this.$refs.realForm.add1(id);
+          this.model.processId=id;
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      // edit1 (record,code) {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.edit1(record,code);
+      //   })
+      // },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      chuancan(res){
+        this.model.accessoriesId=res;
+      },
+      handleOk () {
+        postAction(this.url.add,this.model).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+          this.$emit('valueChange',1)
+          this.close()
+
+        })},
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue
index 0260f61f..b39a77d1 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue
@@ -79,22 +79,25 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit1(record,code)">编辑</a>
 
-          <a-divider type="vertical" />
 
-                <a @click="handleDetail(record)">详情</a>
-          <a-divider type="vertical" />
+<!--          <a-divider type="vertical" />-->
+
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--          <a-divider type="vertical" />-->
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
-
+           <a-divider type="vertical" />
+                    <a @click="up(record.id)">升序</a>
+           <a-divider type="vertical" />
+           <a @click="down(record.id)">降序</a>
         </span>
 
       </a-table>
     </div>
 
-    <zy-process-action-modal ref="modalForm" @ok="modalFormOk"></zy-process-action-modal>
+    <zy-process-action-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-action-modal>
   </a-card>
 </template>
 
@@ -105,6 +108,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ZyProcessActionModal from './ZyProcessActionModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import {getAction} from "@api/manage";
 
   export default {
     name: 'ZyProcessActionList',
@@ -173,6 +177,8 @@
           deleteBatch: "/pro/zyProcessAction/deleteBatch",
           exportXlsUrl: "/pro/zyProcessAction/exportXls",
           importExcelUrl: "pro/zyProcessAction/importExcel",
+          up:"/pro/zyProcessAction/up",
+          down:"/pro/zyProcessAction/down"
 
         },
         dictOptions:{},
@@ -193,12 +199,30 @@
        edit (record) {
         this.id = record;
         this.queryParam.processId=this.id;
-        console.log("燕慧森1号")
          this.url.list='/pro/zyProcessAction/list1'
         this.loadData();
         this.visible = true;
 
       },
+      up(id){
+         getAction(this.url.up,{id:id}).then((res)=>{
+             if(res.success){
+               this.$message.success(res.message);
+             }else{
+               this.$message.warning(res.message);
+             }
+      })},
+           down(id){
+          getAction(this.url.down,{id:id}).then((res)=>{
+              if(res.success){
+                this.$message.success(res.message);
+              }else{
+                this.$message.warning(res.message);
+              }
+      })},
+      valueChange(value){
+        if (value) this.loadData()
+      },
       initDictConfig(){
       },
       getSuperFieldList(){
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionModal.vue
index da3d3288..80586a06 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionModal.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionModal.vue
@@ -8,37 +8,47 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>
+<!--    <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
+    <zy-cloth-action-list ref="realForm"   @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-cloth-action-list>
   </j-modal>
 </template>
 
 <script>
 
-  import ZyProcessActionForm from './ZyProcessActionForm'
+  import ZyClothActionList from "./list/ZyClothActionList";
+  import {postAction} from "../../../api/manage";
   export default {
     name: 'ZyProcessActionModal',
     components: {
-      ZyProcessActionForm
+      ZyClothActionList,
     },
     data () {
       return {
         title:'',
         width:800,
         visible: false,
-        disableSubmit: false
+        disableSubmit: false,
+        model:{
+          processId:'',
+          actionId:'',
+        },
+        url:{
+          add:"/pro/zyProcessAction/add"
+        }
       }
     },
     methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
+      // add () {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.add();
+      //   })
+      // },
       add1 (id) {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add1(id);
+          // this.$refs.realForm.add1(id);
+          this.model.processId=id;
         })
       },
       edit (record) {
@@ -47,19 +57,31 @@
           this.$refs.realForm.edit(record);
         })
       },
-      edit1 (record,code) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit1(record,code);
-        })
-      },
+      // edit1 (record,code) {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.edit1(record,code);
+      //   })
+      // },
       close () {
         this.$emit('close');
         this.visible = false;
       },
-      handleOk () {
-        this.$refs.realForm.submitForm();
+      chuancan(res){
+        this.model.actionId=res;
+        console.log(res)
       },
+      handleOk () {
+        postAction(this.url.add,this.model).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+          this.$emit('valueChange',1)
+          this.close()
+
+        })},
       submitCallback(){
         this.$emit('ok');
         this.visible = false;
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
index 4d3c3af1..864275d0 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
@@ -84,12 +84,12 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit1(record,code)">编辑</a>
+<!--          <a @click="handleEdit1(record,code)">编辑</a>-->
 
-           <a-divider type="vertical" />
+<!--           <a-divider type="vertical" />-->
 
-                <a @click="handleDetail(record)">详情</a>
-                      <a-divider type="vertical" />
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--                      <a-divider type="vertical" />-->
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -99,7 +99,7 @@
       </a-table>
     </div>
 
-    <zy-process-fabric-modal ref="modalForm" @ok="modalFormOk"></zy-process-fabric-modal>
+    <zy-process-fabric-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-fabric-modal>
   </a-card>
 </template>
 
@@ -108,7 +108,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ZyProcessFabricModal from '@/views/cloths/modules/ZyProcessFabricModal'
+  import ZyProcessFabricModal from './ZyProcessFabricModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
@@ -199,6 +199,9 @@
         this.loadData();
         this.visible = true;
       },
+      valueChange(value){
+        if (value) this.loadData()
+      },
       initDictConfig(){
       },
       getSuperFieldList(){
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricModal.vue
new file mode 100644
index 00000000..b47752c2
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricModal.vue
@@ -0,0 +1,94 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+<!--    <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
+   <zy-fabric-list ref="realForm"   @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-fabric-list>
+  </j-modal>
+</template>
+
+<script>
+
+
+  import {postAction} from "../../../api/manage";
+  import ZyFabricList from "./list/ZyFabricList";
+  export default {
+    name: 'ZyProcessActionModal',
+    components: {
+      ZyFabricList,
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        model:{
+          processId:'',
+          fabricId:'',
+        },
+        url:{
+          add:"/pro/zyProcessFabric/add"
+        }
+      }
+    },
+    methods: {
+      // add () {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.add();
+      //   })
+      // },
+      add1 (id) {
+        this.visible=true
+        this.$nextTick(()=>{
+          // this.$refs.realForm.add1(id);
+          this.model.processId=id;
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      // edit1 (record,code) {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.edit1(record,code);
+      //   })
+      // },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      chuancan(res){
+        this.model.fabricId=res;
+      },
+      handleOk () {
+        postAction(this.url.add,this.model).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+          this.$emit('valueChange',1)
+          this.close()
+
+        })},
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue
index 9f3b2a68..8f2eff00 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue
@@ -84,13 +84,6 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit1(record,code)">编辑</a>
-
-          <a-divider type="vertical" />
-
-
-                <a @click="handleDetail(record)">详情</a>
-               <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -100,7 +93,7 @@
       </a-table>
     </div>
 
-    <zy-process-machine-modal ref="modalForm" @ok="modalFormOk"></zy-process-machine-modal>
+    <zy-process-machine-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-machine-modal>
   </a-card>
 </template>
 
@@ -109,7 +102,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ZyProcessMachineModal from '@/views/cloths/modules/ZyProcessMachineModal'
+  import ZyProcessMachineModal from './ZyProcessMachineModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
@@ -194,10 +187,12 @@
       },
     },
     methods: {
+      valueChange(value){
+        if (value) this.loadData()
+      },
       edit (record) {
         this.id = record;
         this.queryParam.processId=this.id;
-        console.log("燕慧森1号")
         this.loadData();
         this.visible = true;
 
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineModal.vue
new file mode 100644
index 00000000..24c6a945
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineModal.vue
@@ -0,0 +1,84 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+   <zy-machine ref="realForm"   @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-machine>
+  </j-modal>
+</template>
+
+<script>
+
+ import ZyMachine from "./list/ZyMachine";
+  import {postAction} from "../../../api/manage";
+  export default {
+    name: 'ZyProcessMachineModal',
+    components: {
+      ZyMachine
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        model:{
+          machineId:'',
+          processId:''
+        },
+        url:{
+          add: "/pro/zyProcessMachine/add",
+        }
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      add1 (id) {
+        this.visible=true
+        this.model.processId=id;
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      chuancan(res){
+        this.model.machineId=res;
+        console.log(res)
+      },
+      handleOk () {
+        postAction(this.url.add,this.model).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+          this.$emit('valueChange',1)
+          this.close()
+
+        })},
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyAccessoriesList.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyAccessoriesList.vue
new file mode 100644
index 00000000..17b2a9be
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyAccessoriesList.vue
@@ -0,0 +1,159 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+
+    </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: onSelectChange1}"
+        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>
+
+
+      </a-table>
+    </div>
+
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ZyAccessoriesList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+
+    },
+    data () {
+      return {
+        description: 'zy_accessories管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'nums'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'contents'
+          },
+
+        ],
+        url: {
+          list: "/accessories/zyAccessories/list",
+          delete: "/accessories/zyAccessories/delete",
+          deleteBatch: "/accessories/zyAccessories/deleteBatch",
+          exportXlsUrl: "/accessories/zyAccessories/exportXls",
+          importExcelUrl: "accessories/zyAccessories/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        let ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        this.$emit('onChangeRowKey',ids)
+      },
+      add (code) {
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'typeId',text:'类型id'})
+        fieldList.push({type:'string',value:'nums',text:'编号'})
+        fieldList.push({type:'string',value:'contents',text:'名称'})
+        fieldList.push({type:'string',value:'picture',text:'图片'})
+        fieldList.push({type:'string',value:'material',text:'材质'})
+        fieldList.push({type:'string',value:'specs',text:'规格'})
+        fieldList.push({type:'int',value:'store',text:'库存量'})
+        fieldList.push({type:'string',value:'supplierInfo',text:'供货商信息'})
+        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyAccessoriesFormDetail.showModal(id)
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyClothActionList.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyClothActionList.vue
new file mode 100644
index 00000000..ad7df5b9
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyClothActionList.vue
@@ -0,0 +1,214 @@
+<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 :sm="5">
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="annual" >
+              <a-input v-model="queryParam.descr" placeholder="请输入描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :sm="5">
+            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
+              <a-input v-model="queryParam.nums" placeholder="请输入编号"  ></a-input>
+            </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_cloth_action')">导出</a-button>-->
+<!--      &lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--      &lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <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: onSelectChange1}"
+        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="handleDetail(record.id)">详情</a>-->
+<!--              <a-divider type="vertical" />-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+
+<!--        </span>-->
+
+      </a-table>
+    </div>
+
+<!--    <zy-cloth-action-modal ref="modalForm" @ok="modalFormOk"></zy-cloth-action-modal>-->
+<!--    <ZyClothActionFormDetail ref="ZyClothActionFormDetail"></ZyClothActionFormDetail>-->
+  </a-card>
+</template>
+
+<script>
+
+  import '@assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ZyClothActionList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+
+    },
+    data () {
+      return {
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        description: 'zy_cloth_action管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'nums'
+          },
+          {
+            title:'描述',
+            align:"center",
+            dataIndex: 'descr'
+          },
+
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/base/zyClothAction/list",
+          delete: "/base/zyClothAction/delete",
+          deleteBatch: "/base/zyClothAction/deleteBatch",
+          exportXlsUrl: "/base/zyClothAction/exportXls",
+          importExcelUrl: "base/zyClothAction/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        let ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        this.$emit('onChangeRowKey',ids)
+      },
+      add (code) {
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'addPeople',text:'添加人',dictCode:''})
+        fieldList.push({type:'int',value:'freq',text:'频率',dictCode:''})
+        fieldList.push({type:'string',value:'descr',text:'描述',dictCode:''})
+        fieldList.push({type:'int',value:'machineTmu',text:'机器TMU',dictCode:''})
+        fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''})
+        fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
+        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyClothActionFormDetail.showModal(id)
+      }
+    }
+  }
+</script>
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyFabricList.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyFabricList.vue
new file mode 100644
index 00000000..0ac99896
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyFabricList.vue
@@ -0,0 +1,196 @@
+<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-search-select-tag placeholder="请选择花样" v-model="queryParam.pattern" dict="pattern"/>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="编号">
+              <a-input placeholder="编号" v-model="queryParam.fabricNumber"></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="queryParam.name"></a-input>
+            </a-form-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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+    </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: onSelectChange1}"
+        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="imgeSlot" slot-scope="text">
+          <img  :src="text" height="" 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>
+
+
+      </a-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+
+  import '@assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ZyFabricList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+    },
+    data () {
+      return {
+        description: '面料表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'fabricNumber'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+        ],
+        url: {
+          list: "/fabric/zyFabric/list",
+          delete: "/fabric/zyFabric/delete",
+          deleteBatch: "/fabric/zyFabric/deleteBatch",
+          exportXlsUrl: "/fabric/zyFabric/exportXls",
+          importExcelUrl: "/fabric/zyFabric/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        let ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        this.$emit('onChangeRowKey',ids)
+      },
+      add (code) {
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'color',text:'颜色',dictCode:''})
+        fieldList.push({type:'sel_search',value:'pattern',text:'花样',dictTable:'', dictText:'', dictCode:'pattern'})
+        fieldList.push({type:'sel_search',value:'material',text:'材质',dictTable:'', dictText:'', dictCode:'material'})
+        fieldList.push({type:'sel_search',value:'ply',text:'厚度',dictTable:'ply', dictText:'', dictCode:''})
+        fieldList.push({type:'int',value:'money',text:'单价',dictCode:''})
+        fieldList.push({type:'string',value:'imageUrl',text:'图片地址',dictCode:''})
+        fieldList.push({type:'popup',value:'typeId',text:'面料类型id', popup:{code:'zy_fabric_type',field:'id',orgFields:'id',destFields:'content'}})
+        fieldList.push({type:'sel_search',value:'brandId',text:'材料品牌id',dictTable:'brand', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'fabricNumber',text:'材料编号',dictCode:''})
+        fieldList.push({type:'int',value:'unit',text:'1、为m。2：kg,等',dictCode:'unit1,,'})
+        fieldList.push({type:'int',value:'retailPrice',text:'零售价',dictCode:''})
+        fieldList.push({type:'sel_search',value:'density',text:'密度',dictTable:'density', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'clothW',text:'幅宽',dictCode:'clothW,,'})
+        fieldList.push({type:'string',value:'location',text:'所在地区',dictCode:''})
+        fieldList.push({type:'int',value:'status',text:'状态  o 为下架 1为上架   ',dictCode:'fabric_status,,'})
+        fieldList.push({type:'int',value:'fabricGrade',text:'等级',dictCode:'fabric_grade,,'})
+        fieldList.push({type:'string',value:'qRcode',text:'二维码',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
+        fieldList.push({type:'sel_depart',value:'supplierInfo',text:'供货商信息'})
+        fieldList.push({type:'string',value:'createTime',text:'创建时间',dictCode:''})
+        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyFabricFormDetailModel.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/ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue
new file mode 100644
index 00000000..37f100ac
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue
@@ -0,0 +1,193 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+      </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_cloth_action')">导出</a-button>-->
+<!--      &lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--      &lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <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: onSelectChange1}"
+        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="handleDetail(record.id)">详情</a>-->
+<!--              <a-divider type="vertical" />-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+
+<!--        </span>-->
+
+      </a-table>
+    </div>
+
+<!--    <zy-cloth-action-modal ref="modalForm" @ok="modalFormOk"></zy-cloth-action-modal>-->
+<!--    <ZyClothActionFormDetail ref="ZyClothActionFormDetail"></ZyClothActionFormDetail>-->
+  </a-card>
+</template>
+
+<script>
+
+  import '@assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ZyClothActionList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+
+    },
+    data () {
+      return {
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        description: 'zy_cloth_action管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'code'
+          },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+       
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/devicetype/zyDevicetype/list1",
+          importExcelUrl: "base/zyClothAction/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        let ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        this.$emit('onChangeRowKey',ids)
+      },
+      add (code) {
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'addPeople',text:'添加人',dictCode:''})
+        fieldList.push({type:'int',value:'freq',text:'频率',dictCode:''})
+        fieldList.push({type:'string',value:'descr',text:'描述',dictCode:''})
+        fieldList.push({type:'int',value:'machineTmu',text:'机器TMU',dictCode:''})
+        fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''})
+        fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
+        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyClothActionFormDetail.showModal(id)
+      }
+    }
+  }
+</script>
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyToolList.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyToolList.vue
new file mode 100644
index 00000000..df23758f
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyToolList.vue
@@ -0,0 +1,154 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+
+    </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: onSelectChange1}"
+        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>
+
+      </a-table>
+    </div>
+
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+
+  export default {
+    name: 'ZyToolList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+    },
+    data () {
+      return {
+        description: 'zy_tool管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'nums'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+
+        ],
+        url: {
+          list: "/tool/zyTool/list",
+          delete: "/tool/zyTool/delete",
+          deleteBatch: "/tool/zyTool/deleteBatch",
+          exportXlsUrl: "/tool/zyTool/exportXls",
+          importExcelUrl: "tool/zyTool/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        let ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        this.$emit('onChangeRowKey',ids)
+      },
+      add (code) {
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'工具名称'})
+        fieldList.push({type:'string',value:'nums',text:'工具编号'})
+        fieldList.push({type:'string',value:'function',text:'功能'})
+        fieldList.push({type:'string',value:'specs',text:'规格'})
+        fieldList.push({type:'string',value:'scope',text:'适用范围'})
+        fieldList.push({type:'string',value:'workshopSection',text:'责人工段'})
+        fieldList.push({type:'string',value:'status',text:'状态 ( 0 在库、1   在用、2   遗失 、3   损坏、4   报废)'})
+        fieldList.push({type:'string',value:'qrode',text:'二维码'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothActionController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothActionController.java
index b51a8218..b36181ff 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothActionController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothActionController.java
@@ -167,5 +167,10 @@ public class ZyClothActionController extends JeecgController<ZyClothAction, IZyC
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ZyClothAction.class);
     }
+	@GetMapping(value = "/sort")
+	 public Result<?> sort(){
+		String s=zyClothActionService.sort();
+		return Result.ok(s.substring(1));
+	}
 
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
index 4595a4d8..96c3b8fe 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
@@ -179,7 +179,7 @@ public class ZyProcess implements Serializable {
      */
     @Excel(name = "类型名称", width = 15)
     @ApiModelProperty(value = "类型名称")
-    @Dict(dictTable = "zy_cloths_type", dicText = "zy_cloths_type", dicCode = "nums")
+    @Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "nums")
     private java.lang.String styleId;
     /**
      * 工段代码
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothActionMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothActionMapper.java
index d988e941..aa6d1ae4 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothActionMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothActionMapper.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.base.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.demo.base.entity.ZyClothAction;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZyClothActionMapper extends BaseMapper<ZyClothAction> {
 
+    @Select("select nums from zy_cloth_action order by nums desc limit 0,1")
+    String sort();
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothActionService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothActionService.java
index e34482ea..bd9c3fa3 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothActionService.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothActionService.java
@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IZyClothActionService extends IService<ZyClothAction> {
 
+    String sort();
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothActionServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothActionServiceImpl.java
index 3c6399e9..ba424977 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothActionServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothActionServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.base.service.impl;
 import org.jeecg.modules.demo.base.entity.ZyClothAction;
 import org.jeecg.modules.demo.base.mapper.ZyClothActionMapper;
 import org.jeecg.modules.demo.base.service.IZyClothActionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyClothActionServiceImpl extends ServiceImpl<ZyClothActionMapper, ZyClothAction> implements IZyClothActionService {
 
+    @Autowired
+    ZyClothActionMapper zyClothActionMapper;
+    @Override
+    public String sort() {
+        return zyClothActionMapper.sort();
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java
index 4fccd6a8..e01d31cc 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java
@@ -109,13 +109,17 @@ public class ZyProcessAccessoriesController extends JeecgController<ZyProcessAcc
 	@ApiOperation(value="面料表-添加", notes="面料表-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyProcessAccessories zyProcessAccessories) {
+		String[] split = zyProcessAccessories.getAccessoriesId().split(",");
+		for (String k : split) {
+			zyProcessAccessories.setAccessoriesId(k);
 		QueryWrapper s=new QueryWrapper();
 		s.eq("process_id",zyProcessAccessories.getProcessId());
 		s.eq("accessories_id",zyProcessAccessories.getAccessoriesId());
 		int a=zyProcessAccessoriesService.count(s);
-		if(a>=1)
-			return Result.error("已存在本信息");
+		if(a==0)
 		zyProcessAccessoriesService.save(zyProcessAccessories);
+		zyProcessAccessories.setId(null);
+		}
 		return Result.OK("添加成功！");
 	}
 
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java
index eae93464..1fb140e2 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java
@@ -108,13 +108,18 @@ public class ZyProcessActionController extends JeecgController<ZyProcessAction,
 	@ApiOperation(value="zy_process_action-添加", notes="zy_process_action-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyProcessAction zyProcessAction) {
-		QueryWrapper s=new QueryWrapper();
-		s.eq("process_id",zyProcessAction.getProcessId());
-		s.eq("action_id",zyProcessAction.getActionId());
-		int a=zyProcessActionService.count(s);
-		if(a>=1)
-			return Result.error("已存在本信息");
-		zyProcessActionService.save(zyProcessAction);
+		String[] split = zyProcessAction.getActionId().split(",");
+		for (String k : split) {
+			zyProcessAction.setActionId(k);
+			QueryWrapper s=new QueryWrapper();
+			s.eq("process_id",zyProcessAction.getProcessId());
+			s.eq("action_id",zyProcessAction.getActionId());
+			int a=zyProcessActionService.count(s);
+			if(a==0)
+				zyProcessActionService.save(zyProcessAction);
+			zyProcessAction.setId(null);
+		}
+
 		return Result.OK("添加成功！");
 	}
 
@@ -205,5 +210,22 @@ public class ZyProcessActionController extends JeecgController<ZyProcessAction,
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ZyProcessAction.class);
     }
+	 @AutoLog(value = "排序")
+	 @ApiOperation(value="排序", notes="排序")
+	 @GetMapping(value = "/up")
+	 public Result<?> shang(@RequestParam(name="id",required=true) String id) {
+		zyProcessActionService.up(id);
+		return Result.ok("升序成功");
+	 }
+	 @AutoLog(value = "排序")
+	 @ApiOperation(value="排序", notes="排序")
+	 @GetMapping(value = "/down")
+	 public Result<?> xia(@RequestParam(name="id",required=true) String id) {
+		int a=zyProcessActionService.findSort(id);
+		if(a==0)
+			return Result.error("当前已经是最低级别！！！");
+		zyProcessActionService.down(id);
+		 return Result.ok("降序成功");
+	 }
 
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java
index f06fb4f2..d0881c70 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java
@@ -106,13 +106,17 @@ public class ZyProcessFabricController extends JeecgController<ZyProcessFabric,
 	@ApiOperation(value="zy_process_fabric-添加", notes="zy_process_fabric-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyProcessFabric zyProcessFabric) {
+		String[] split = zyProcessFabric.getFabricId().split(",");
+		for (String k : split) {
+			zyProcessFabric.setFabricId(k);
 		QueryWrapper s=new QueryWrapper();
 		s.eq("process_id",zyProcessFabric.getProcessId());
 		s.eq("fabric_id",zyProcessFabric.getFabricId());
 		int a=zyProcessFabricService.count(s);
-		if(a>=1)
-			return Result.error("已存在本信息");
+		if(a==0)
 		zyProcessFabricService.save(zyProcessFabric);
+		zyProcessFabric.setId(null);
+		}
 		return Result.OK("添加成功！");
 	}
 
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java
index c7d7dafc..2afaaf83 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java
@@ -105,13 +105,17 @@ public class ZyProcessMachineController extends JeecgController<ZyProcessMachine
 	@ApiOperation(value="zy_process_machine-添加", notes="zy_process_machine-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyProcessMachine zyProcessMachine) {
+		String[] split = zyProcessMachine.getMachineId().split(",");
+		for (String k : split) {
+			zyProcessMachine.setMachineId(k);
 		QueryWrapper s=new QueryWrapper();
 		s.eq("process_id",zyProcessMachine.getProcessId());
 		s.eq("machine_id",zyProcessMachine.getMachineId());
 		int a=zyProcessMachineService.count(s);
-		if(a>=1)
-			return Result.error("已存在本信息");
+		if(a==0)
 		zyProcessMachineService.save(zyProcessMachine);
+		zyProcessMachine.setId(null);
+		}
 		return Result.OK("添加成功！");
 	}
 
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
index 584e11c0..7b9c6d07 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import org.jeecg.modules.demo.base.entity.ZyClothAction;
 import org.jeecg.modules.demo.pro.entity.ZyProcessAction;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -25,4 +26,12 @@ public interface ZyProcessActionMapper extends BaseMapper<ZyProcessAction> {
     IPage<ZyProcessAction> page1(Page<ZyProcessAction> page, @Param("p") String s, @Param("m") String t);
     @Select("select * from zy_cloth_action where id in (select action_id from zy_process_action where process_id=#{id}) ")
     List<ZyClothAction> selectByid(String id);
+
+    @Update("UPDATE zy_process_action SET sort_action=sort_action+1 WHERE id=#{id} ")
+    void up(String id);
+    @Update("UPDATE zy_process_action SET sort_action=sort_action-1 WHERE id=#{id} ")
+    void down(String id);
+
+    @Select("select sort_action from zy_process_action where id=#{id} ")
+    int findSort(String id);
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java
index db1e0a9f..b506ed26 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java
@@ -22,4 +22,10 @@ public interface IZyProcessActionService extends IService<ZyProcessAction> {
     IPage<ZyProcessAction> page1(Page<ZyProcessAction> page, String s, String t);
 
     List<ZyClothAction> selectByid(String id);
+
+    void up(String id);
+
+    int findSort(String id);
+
+    void down(String id);
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java
index e34fced3..c1b7432d 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java
@@ -39,4 +39,19 @@ public class ZyProcessActionServiceImpl extends ServiceImpl<ZyProcessActionMappe
     public List<ZyClothAction> selectByid(String id) {
         return zyProcessActionMapper.selectByid(id);
     }
+
+    @Override
+    public void up(String id) {
+        zyProcessActionMapper.up(id);
+    }
+
+    @Override
+    public int findSort(String id) {
+        return zyProcessActionMapper.findSort(id);
+    }
+
+    @Override
+    public void down(String id) {
+        zyProcessActionMapper.down(id);
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java
index 97066141..34961978 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java
@@ -119,6 +119,18 @@ public class ZyDevicetypeController extends JeecgController<ZyDevicetype, IZyDev
 
 		return Result.OK(pageList);
 	}
+	 @AutoLog(value = "设备类型-分页列表查询")
+	 @ApiOperation(value="设备类型-分页列表查询", notes="设备类型-分页列表查询")
+	 @GetMapping(value = "/list1")
+	 public Result<?> queryPageList1(ZyDevicetype zyDevicetype,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+		 QueryWrapper<ZyDevicetype> queryWrapper = QueryGenerator.initQueryWrapper(zyDevicetype, req.getParameterMap());
+		 Page<ZyDevicetype> page = new Page<ZyDevicetype>(pageNo, pageSize);
+		 IPage<ZyDevicetype> pageList = zyDevicetypeService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
 
 
 	 /**
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java
index d76f7a37..ab62d81b 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java
@@ -50,7 +50,6 @@ public class ZyOperationtoolController extends JeecgController<ZyOperationtool,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        //QueryWrapper<ZyOperationtool> queryWrapper = QueryGenerator.initQueryWrapper(zyOperationtool, req.getParameterMap());
-       System.out.println("asdadad*********************************************");
        String s=null,t=null;
        if(zyOperationtool.getOperationid()!=null){
            s="%"+zyOperationtool.getOperationid()+"%";
@@ -89,13 +88,17 @@ public class ZyOperationtoolController extends JeecgController<ZyOperationtool,
    @ApiOperation(value="工序工具-添加", notes="工序工具-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody ZyOperationtool zyOperationtool) {
+       String[] split = zyOperationtool.getToolid().split(",");
+       for (String k : split) {
+           zyOperationtool.setToolid(k);
        QueryWrapper s=new QueryWrapper();
        s.eq("operationid",zyOperationtool.getOperationid());
        s.eq("toolid",zyOperationtool.getToolid());
        int a=zyOperationtoolService.count(s);
-       if(a>=1)
-           return Result.error("已存在本信息");
+       if(a==0)
        zyOperationtoolService.save(zyOperationtool);
+       zyOperationtool.setId(null);
+       }
        return Result.OK("添加成功！");
    }
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java
index d388e6ee..dfc0b405 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java
@@ -20,6 +20,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface ZyOperationtoolMapper extends BaseMapper<ZyOperationtool> {
     @Select("<script>select * from zy_operationtool <where><if test=\" p != null\">operationid in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and toolid in (select id from zy_tool_types where name like #{m})</if></where></script>")
     IPage<ZyOperationtool> page(Page<ZyOperationtool> page, @Param("p") String s, @Param("m") String t);
-    @Select("<script>select a.*,b.process_code,c.nums from zy_operationtool as a,zy_process as b,zy_tool as c <where>a.operationid=b.id and a.toolid=c.id and a.operationid =#{p}<if test=\" m != null\"> and toolid in (select id from zy_tool_types where name like #{m})</if></where></script>")
+    @Select("<script>select a.*,b.process_code,c.nums from zy_operationtool as a,zy_process as b,zy_tool as c <where>a.operationid=b.id and a.toolid=c.id and a.operationid =#{p}<if test=\" m != null\"> and toolid in (select id from zy_tool where name like #{m})</if></where></script>")
     IPage<ZyOperationtool> page1(Page<ZyOperationtool> page, @Param("p") String s, @Param("m") String t);
 }

From f40a4112c4698855e25ceb51207f39221a42bd1a Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Sat, 3 Dec 2022 17:26:06 +0800
Subject: [PATCH 2/6] =?UTF-8?q?2022-12-03=20=E8=B5=B5=E7=8E=89=E7=91=9E=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/process/ZyClothsComponentList.vue   | 12 ++++--
 .../src/views/process/ZyClothsModularList.vue |  2 +-
 .../process/modules/ZyClothsComponentForm.vue | 35 ++++++++++------
 .../process/modules/ZyClothsModularForm.vue   | 10 +++--
 .../modules/ZyClothsStyleForm.vue             |  4 +-
 .../zystylemodular/modules/ZyProcessList.vue  |  3 +-
 .../modules/ZyStyleModularModal.vue           |  3 +-
 .../zyStyleModular/entity/ZyStyleModular.java |  2 +-
 .../ZyClothsComponentController.java          | 11 +++++
 .../controller/ZyClothsModularController.java |  8 ++++
 .../demo/base/entity/ZyClothsComponent.java   |  6 +++
 .../modules/demo/base/entity/ZyProcess.java   |  2 +-
 .../base/mapper/ZyClothsComponentMapper.java  |  2 +
 .../mapper/xml/ZyClothsComponentMapper.xml    |  4 ++
 .../service/IZyClothsComponentService.java    |  3 ++
 .../impl/ZyClothsComponentServiceImpl.java    | 41 ++++++++++++++++++-
 .../demo/pro/entity/ZyProcessComponent.java   |  2 +-
 .../entity/ZyProcessModular.java              |  2 +-
 18 files changed, 119 insertions(+), 33 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
index b4af96cb..61d22267 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
@@ -145,12 +145,16 @@
             align:"center",
             dataIndex: 'partsName'
           },
+          // {
+          //   title:'部件类型',
+          //   align:"center",
+          //   dataIndex: 'componentType'
+          // },
           {
-            title:'部件类型',
-            align:"center",
-            dataIndex: 'componentType'
+            title: '服装类型',
+            align: "center",
+            dataIndex: 'clothsTypeId_dictText'
           },
-
           // {
           //   title:'描述',
           //   align:"center",
diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
index c086a43e..9c5815bc 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
@@ -173,7 +173,7 @@ export default {
         //   dataIndex: 'description'
         // },
         {
-          title: '衣服类型',
+          title: '服装类型',
           align: "center",
           dataIndex: 'clothsTypeId_dictText'
         },
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
index 7d61698f..75dee5ff 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
@@ -8,21 +8,31 @@
               <j-select-depart  v-model="model.enterpriseId"   />
             </a-form-model-item>
           </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
+<!--              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
-            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
-              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>
+            <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">
+              <a-input v-model="model.partsName" placeholder="请输入部件名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">
-              <a-input v-model="model.partsName" placeholder="请输入部件名称"  ></a-input>
+            <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
+              <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="部件类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentType">
-              <a-input v-model="model.componentType" placeholder="请输入部件类型"  ></a-input>
+            <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">
+              <j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />
             </a-form-model-item>
           </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="部件类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentType">-->
+<!--              <a-input v-model="model.componentType" placeholder="请输入部件类型"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
               <a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
@@ -33,11 +43,7 @@
               <j-image-upload isMultiple  v-model="model.pictureUrl" ></j-image-upload>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">
-              <j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />
-            </a-form-model-item>
-          </a-col>
+
 <!--          <a-col :span="24">-->
 <!--            <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">-->
 <!--              <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />-->
@@ -86,8 +92,11 @@
         },
         confirmLoading: false,
         validatorRules: {
-          nums: [
-            { required: true, message: '请输入编号!'},
+          // nums: [
+          //   { required: true, message: '请输入编号!'},
+          // ],
+          clothsTypeId: [
+               { required: true, message: '请选择服装类型!'},
           ],
           partsName: [
             { required: true, message: '请输入部件名称!'},
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
index 09468606..05ec500c 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
@@ -13,6 +13,7 @@
 <!--              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>-->
 <!--            </a-form-model-item>-->
 <!--          </a-col>-->
+
           <a-col :span="24">
             <a-form-model-item label="模块名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularName">
               <a-input v-model="model.modularName" placeholder="请输入模块名称"  ></a-input>
@@ -23,14 +24,15 @@
 <!--              <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />-->
 <!--            </a-form-model-item>-->
 <!--          </a-col>-->
+
           <a-col :span="24">
-            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
-              <a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
+            <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
+              <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择服装类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="衣服类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
-              <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
+              <a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
             </a-form-model-item>
           </a-col>
 <!--          <a-col :span="24">-->
diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
index 06fa526c..9863cc3b 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
@@ -34,8 +34,8 @@
 <!--            </a-form-model-item>-->
 <!--          </a-col>-->
           <a-col :span="24">
-            <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleNames">
-              <a-input v-model="model.styleNames" placeholder="请输入名称"  ></a-input>
+            <a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleNames">
+              <a-input v-model="model.styleNames" placeholder="请输入款式名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue
index 535e9ec7..b702ae1d 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue
@@ -3,6 +3,7 @@
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row>
         </a-row>
       </a-form>
     </div>
@@ -160,7 +161,7 @@ export default {
       },
     //加载传递参数
     loadParameter() {
-      if (this.loadRouteType == false) {
+      if (this.loadRouteType === false) {
         this.styleId = this.$route.query.styleId;
         console.log(this.styleId)
         this.loadRouteType = true;
diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue
index bee39186..a7ec8596 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue
@@ -19,7 +19,6 @@
     name: 'ZyStyleModularModal',
     components: {
         ZyProcessList,
-
     },
     data () {
       return {
@@ -40,7 +39,7 @@
     },
     methods: {
       add () {
-          this.model.styleId=this.$route.query.id;
+        this.model.styleId=this.$route.query.id;
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.add();
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java
index 0444a4d0..f697df02 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java
@@ -68,5 +68,5 @@ public class ZyStyleModular implements Serializable {
     /**序号*/
     @Excel(name = "序号", width = 15,dicCode = "序号")
     @ApiModelProperty(value = "序号")
-    private Integer order;
+    private Integer serialnumber;
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
index b6a5890e..8b9950ba 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.demo.base.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -88,6 +89,16 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
     @ApiOperation(value = "zy_cloths_component-添加", notes = "zy_cloths_component-添加")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody ZyClothsComponent zyClothsComponent) {
+        //编码规则：服装类型（10）+序号（8）
+        zyClothsComponent.setNums(zyClothsComponentService.generateNumber(zyClothsComponent));
+        //部件名称不能重复
+        LambdaQueryWrapper<ZyClothsComponent> queryWrapper = new LambdaQueryWrapper<>();
+        List<ZyClothsComponent> zyClothsComponentList = zyClothsComponentService.list(queryWrapper);
+        for (ZyClothsComponent zy : zyClothsComponentList) {
+            if (zyClothsComponent.getPartsName().equals(zy.getPartsName())){
+                return Result.error("添加失败！数据已存在");
+            }
+        }
         zyClothsComponentService.save(zyClothsComponent);
         return Result.OK("添加成功！");
     }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
index 51098213..bcec6b5d 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
 import org.jeecg.modules.demo.base.entity.ZyClothsModular;
 import org.jeecg.modules.demo.base.entity.ZyClothsType;
 import org.jeecg.modules.demo.base.service.IZyClothsModularService;
@@ -105,6 +106,13 @@ public class ZyClothsModularController extends JeecgController<ZyClothsModular,
 	public Result<?> add(@RequestBody ZyClothsModular zyClothsModular) {
 		//nums，编号，varchar，18，非空，不重复，编码规则：服装类型（10）+序号（8）
 		zyClothsModular.setNums(zyClothsModularService.generateNumber(zyClothsModular));
+		//模块名称不能重复
+		List<ZyClothsModular> zyClothsModularList = zyClothsModularService.list();
+		for (ZyClothsModular zy : zyClothsModularList) {
+			if (zyClothsModular.getModularName().equals(zy.getModularName())){
+				return Result.error("添加失败！模块名称已存在");
+			}
+		}
 		zyClothsModularService.save(zyClothsModular);
 		return Result.OK("添加成功！");
 	}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java
index 7448ca16..64c98d96 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java
@@ -52,6 +52,12 @@ public class ZyClothsComponent implements Serializable {
 	@Excel(name = "图片地址", width = 15)
     @ApiModelProperty(value = "图片地址")
     private java.lang.String pictureUrl;
+    /**服装类型id*/
+    @Excel(name = "服装类型id", width = 15, dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id")
+    @Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id")
+    @ApiModelProperty(value = "服装类型id")
+    private java.lang.String clothsTypeId;
+
 	/**模块*/
 	@Excel(name = "模块", width = 15, dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id")
 	@Dict(dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id")
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
index 4595a4d8..96c3b8fe 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
@@ -179,7 +179,7 @@ public class ZyProcess implements Serializable {
      */
     @Excel(name = "类型名称", width = 15)
     @ApiModelProperty(value = "类型名称")
-    @Dict(dictTable = "zy_cloths_type", dicText = "zy_cloths_type", dicCode = "nums")
+    @Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "nums")
     private java.lang.String styleId;
     /**
      * 工段代码
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java
index febcf394..c65c3a5d 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java
@@ -22,4 +22,6 @@ public interface ZyClothsComponentMapper extends BaseMapper<ZyClothsComponent> {
     public List<ZyClothsComponent> selectByModular(@Param("modular_id")String modular_id);
 
     String getComponentNameById(String componentId);
+
+    List<String> selectNumsList2();
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml
index 00fd10ba..bf05980e 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml
@@ -29,4 +29,8 @@
         from zy_cloths_component
         where id = #{componentId}
     </select>
+    <select id="selectNumsList2" resultType="java.lang.String">
+        select nums
+        from zy_cloths_component
+    </select>
 </mapper>
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsComponentService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsComponentService.java
index 7f30145b..d5a0ea36 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsComponentService.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsComponentService.java
@@ -18,4 +18,7 @@ public interface IZyClothsComponentService extends IService<ZyClothsComponent> {
 
     List<ZyProcessVo> selectList(String id);
     public List<ZyClothsComponent> selectByModular(String modular_id);
+
+    /**编码规则：服装类型（10）+序号（8）*/
+    String generateNumber(ZyClothsComponent zyClothsComponent);
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
index 8b16bb79..ada0a13d 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
@@ -10,8 +10,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.util.StringUtils;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.regex.Pattern;
 
 /**
  * @Description: zy_cloths_component
@@ -21,7 +26,7 @@ import java.util.List;
  */
 @Service
 public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentMapper, ZyClothsComponent> implements IZyClothsComponentService {
-    @Autowired
+    @Resource
     private ZyClothsComponentMapper zyClothsComponentMapper;
 
     @Override
@@ -30,9 +35,41 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentM
      List<ZyProcessVo> zyProcessVoList=baseMapper.selectProcessVo(list);
         return zyProcessVoList;
     }
-    
+
     @Override
     public List<ZyClothsComponent> selectByModular(String modular_id) {
         return zyClothsComponentMapper.selectByModular(modular_id);
     }
+
+    /**
+     * 编码规则：服装类型（10）+序号（8）
+     */
+    @Override
+    public String generateNumber(ZyClothsComponent zyClothsComponent) {
+        String nums = zyClothsComponent.getClothsTypeId();
+        String substring = nums.substring(nums.length() - 10);
+        String format = String.format("%08d", orderNumber());
+        return substring + format;
+    }
+
+    private Long orderNumber() {
+        List<String> listString = zyClothsComponentMapper.selectNumsList2();
+        //System.err.println(listString);
+        List<Long> listLong = new ArrayList<>();
+        for (String nums : listString) {
+            String REGEX = "[^0-9]";
+            String newNums = Pattern.compile(REGEX).matcher(nums).replaceAll("").trim();
+            if (!StringUtils.hasText(newNums)){
+                newNums = "0";
+            }
+            if (newNums.length() > 8) {
+                String substring = nums.substring(nums.length() - 8);
+                listLong.add(Long.valueOf(substring));
+            }else {
+                listLong.add(Long.valueOf(newNums));
+            }
+        }
+        System.out.println(listLong);
+        return Collections.max(listLong)+1;
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java
index 370dd852..32b73cd5 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java
@@ -52,7 +52,7 @@ public class ZyProcessComponent implements Serializable {
     /**序号*/
     @Excel(name = "序号", width = 15,dicCode = "序号")
     @ApiModelProperty(value = "序号")
-    private Integer order;
+    private Integer serialnumber;
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java
index 57e83acc..c24f3d21 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java
@@ -65,5 +65,5 @@ public class ZyProcessModular implements Serializable {
     /**序号*/
     @Excel(name = "序号", width = 15,dicCode = "序号")
     @ApiModelProperty(value = "序号")
-    private Integer order;
+    private Integer serialnumber;
 }

From 7e03e1e92a573ababfb64b7bfdb9081b00839975 Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Mon, 5 Dec 2022 20:18:02 +0800
Subject: [PATCH 3/6] =?UTF-8?q?2022-12-05=20=E8=B5=B5=E7=8E=89=E7=91=9E=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/modules/ZyClothsComponentForm.vue      |  8 ++++----
 .../zystyleaccessories/ZyStyleAccessoriesList.vue  | 12 ++++++------
 .../views/zystylemodular/ZyStyleModularList.vue    | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
index 75dee5ff..5ae1cd1a 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
@@ -14,13 +14,13 @@
 <!--            </a-form-model-item>-->
 <!--          </a-col>-->
           <a-col :span="24">
-            <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">
-              <a-input v-model="model.partsName" placeholder="请输入部件名称"  ></a-input>
+            <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
+              <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
-              <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />
+            <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">
+              <a-input v-model="model.partsName" placeholder="请输入部件名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue
index c9a96b1f..8e551899 100644
--- a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue
@@ -38,13 +38,13 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('款式辅料管理')">导出</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>
+<!--      <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>
+<!--      <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">
diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue b/ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue
index f95fda33..1b201efd 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue
@@ -5,7 +5,7 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col>
-            <a-button type="primary">{{biaoTi}}款式工序管理</a-button>
+            <a-button type="primary">{{biaoTi}}</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -16,13 +16,13 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('款式工序表')">导出</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>
+<!--      <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>
+<!--      <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">

From b66926ca3ce98112d3df24112daab936482c1af3 Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Mon, 5 Dec 2022 21:14:03 +0800
Subject: [PATCH 4/6] =?UTF-8?q?2022-12-05=20=E8=B5=B5=E7=8E=89=E7=91=9E=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/modules/ZyClothsTypeForm.vue      | 16 +++----
 .../controller/ZyClothsTypeController.java    |  2 +
 .../demo/base/mapper/ZyClothsTypeMapper.java  |  1 +
 .../base/mapper/xml/ZyClothsTypeMapper.xml    |  4 ++
 .../base/service/IZyClothsTypeService.java    |  2 +
 .../impl/ZyClothsComponentServiceImpl.java    | 12 +++--
 .../impl/ZyClothsModularServiceImpl.java      | 12 +++--
 .../service/impl/ZyClothsTypeServiceImpl.java | 47 +++++++++++++++++++
 .../impl/ZyClothsStyleServiceImpl.java        | 12 +++--
 9 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
index 2fefb067..03512483 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
@@ -18,11 +18,11 @@
               {{ typeId }}
             </a-form-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
-              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
+<!--              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeName">
               <a-input v-model="model.typeName" placeholder="请输入类型名称"  ></a-input>
@@ -74,9 +74,9 @@
         },
         confirmLoading: false,
         validatorRules: {
-          nums: [
-            { required: true, message: '请输入编号!'},
-          ],
+          // nums: [
+          //   { required: true, message: '请输入编号!'},
+          // ],
           typeName: [
             { required: true, message: '请输入类型名称!'},
             { pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;，。；、!?]{0,5}$/, message: '文本长度过长'},
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
index 8688b0da..aa81015e 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
@@ -82,6 +82,8 @@ public class ZyClothsTypeController extends JeecgController<ZyClothsType, IZyClo
 	@ApiOperation(value="zy_cloths_type-添加", notes="zy_cloths_type-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyClothsType zyClothsType) {
+		//生成编号 nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）在service层处理
+		zyClothsType.setNums(zyClothsTypeService.generateNumber());
 		zyClothsTypeService.save(zyClothsType);
 		return Result.OK("添加成功！");
 	}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
index 9d63f5bb..ebe37d59 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZyClothsTypeMapper extends BaseMapper<ZyClothsType> {
 
+    List<String> selectNumsList();
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsTypeMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsTypeMapper.xml
index 5111558b..3651d8fe 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsTypeMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsTypeMapper.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper">
 
+    <select id="selectNumsList" resultType="java.lang.String">
+        SELECT nums
+        FROM zy_cloths_type
+    </select>
 </mapper>
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java
index 0c926d2b..0f1b4359 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java
@@ -11,4 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IZyClothsTypeService extends IService<ZyClothsType> {
 
+    /**nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）*/
+    String generateNumber();
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
index ada0a13d..ceb26aac 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
@@ -2,9 +2,11 @@ package org.jeecg.modules.demo.base.service.impl;
 
 import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
 import org.jeecg.modules.demo.base.entity.ZyClothsModular;
+import org.jeecg.modules.demo.base.entity.ZyClothsType;
 import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
 import org.jeecg.modules.demo.base.mapper.ZyClothsComponentMapper;
 import org.jeecg.modules.demo.base.mapper.ZyClothsModularMapper;
+import org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper;
 import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +30,8 @@ import java.util.regex.Pattern;
 public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentMapper, ZyClothsComponent> implements IZyClothsComponentService {
     @Resource
     private ZyClothsComponentMapper zyClothsComponentMapper;
+    @Resource
+    ZyClothsTypeMapper zyClothsTypeMapper;
 
     @Override
     public List<ZyProcessVo> selectList(String id) {
@@ -47,9 +51,11 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentM
     @Override
     public String generateNumber(ZyClothsComponent zyClothsComponent) {
         String nums = zyClothsComponent.getClothsTypeId();
-        String substring = nums.substring(nums.length() - 10);
-        String format = String.format("%08d", orderNumber());
-        return substring + format;
+        ZyClothsType zyClothsType = zyClothsTypeMapper.selectById(nums);
+        String nums1 = zyClothsType.getNums();
+        //String substring = nums.substring(nums.length() - 10);
+        String format = String.format("%06d", orderNumber());
+        return nums1 + format;
     }
 
     private Long orderNumber() {
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularServiceImpl.java
index e228e589..7484c9f6 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularServiceImpl.java
@@ -1,7 +1,9 @@
 package org.jeecg.modules.demo.base.service.impl;
 
 import org.jeecg.modules.demo.base.entity.ZyClothsModular;
+import org.jeecg.modules.demo.base.entity.ZyClothsType;
 import org.jeecg.modules.demo.base.mapper.ZyClothsModularMapper;
+import org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper;
 import org.jeecg.modules.demo.base.service.IZyClothsModularService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +26,8 @@ import java.util.regex.Pattern;
 public class ZyClothsModularServiceImpl extends ServiceImpl<ZyClothsModularMapper, ZyClothsModular> implements IZyClothsModularService {
     @Resource
     private ZyClothsModularMapper zyClothsModularMapper;
+    @Resource
+    ZyClothsTypeMapper zyClothsTypeMapper;
 
     @Override
     public List<ZyClothsModular> selectByType(String cloths_type_id) {
@@ -36,9 +40,11 @@ public class ZyClothsModularServiceImpl extends ServiceImpl<ZyClothsModularMappe
     @Override
     public String generateNumber(ZyClothsModular zyClothsModular) {
         String nums = zyClothsModular.getClothsTypeId();
-        String substring = nums.substring(nums.length() - 10);
-        String format = String.format("%08d", orderNumber());
-        return substring + format;
+        ZyClothsType zyClothsType = zyClothsTypeMapper.selectById(nums);
+        String nums1 = zyClothsType.getNums();
+       // String substring = nums.substring(nums.length() - 10);
+        String format = String.format("%06d", orderNumber());
+        return nums1 + format;
 
     }
 
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
index 5a9b70f5..1853308c 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
@@ -6,6 +6,13 @@ import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Pattern;
 
 /**
  * @Description: zy_cloths_type
@@ -16,4 +23,44 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyClothsTypeServiceImpl extends ServiceImpl<ZyClothsTypeMapper, ZyClothsType> implements IZyClothsTypeService {
 
+    @Resource
+    ZyClothsTypeMapper zyClothsTypeMapper;
+    /**
+     * nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）
+     */
+    @Override
+    public String generateNumber() {
+        //先拿到类型编号
+        String nums = "QIYE";
+        //再来一个顺序号
+        String format = String.format("%06d", orderNumber());
+        //生成编码
+        String result = nums + format;
+        System.err.println(result);
+        return nums + format;
+    }
+
+    private Long orderNumber() {
+        List<String> listString = zyClothsTypeMapper.selectNumsList();
+        System.out.println(listString);
+        List<Long> listLong = new ArrayList<>();
+        for (String nums : listString) {
+            System.err.println(nums);
+            String REGEX = "[^0-9]";
+            //只要数字
+            String newNums = Pattern.compile(REGEX).matcher(nums).replaceAll("").trim();
+            System.err.println(newNums);
+            if (!StringUtils.hasText(newNums)){
+                newNums = "0";
+            }
+            if (newNums.length() > 6) {
+                //拿到后6位
+                String substring = newNums.substring(newNums.length() - 6);
+                listLong.add(Long.valueOf(substring));
+            }else {
+                listLong.add(Long.valueOf(newNums));
+            }
+        }
+        return Collections.max(listLong)+1;
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java
index 2d9c44ed..9b6ce4ef 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java
@@ -3,6 +3,8 @@ package org.jeecg.modules.zyclothsstyle.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.bytedeco.javacpp.freenect;
+import org.jeecg.modules.demo.base.entity.ZyClothsType;
+import org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper;
 import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
 import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper;
 import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
@@ -30,6 +32,8 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
     @Resource
     private ZyClothsStyleMapper zyClothsStyleMapper;
 
+    @Resource
+    ZyClothsTypeMapper zyClothsTypeMapper;
     /**
      * 生成编号 类型编号（10位）+顺序号（8位）
      *
@@ -39,12 +43,14 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
     public String generateNumber(ZyClothsStyle zyClothsStyle) {
         //先拿到类型编号
         String nums = zyClothsStyle.getTypeId();
+        ZyClothsType zyClothsType = zyClothsTypeMapper.selectById(nums);
+        String nums1 = zyClothsType.getNums();
         //截取后十位
-        String substring = nums.substring(nums.length() - 10);
+        //String substring = nums.substring(nums.length() - 10);
         //再来一个顺序号
-        String format = String.format("%08d", orderNumber());
+        String format = String.format("%06d", orderNumber());
         //生成编码
-        return substring + format;
+        return nums1 + format;
     }
 
     private Long orderNumber() {

From ec9c033e18ce2f0ce2db9d444cb1a831dc7fe1af Mon Sep 17 00:00:00 2001
From: lenovo <123>
Date: Tue, 6 Dec 2022 12:33:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?2022-12-6=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessories/modules/ZyAccessoriesForm.vue | 23 +++++--
 .../modules/ZyAccessoriesTypeForm.vue         | 15 ++++-
 .../views/erp/fabric/modules/ZyFabricForm.vue | 37 ++++++++---
 .../erp/fabric/modules/ZyFabricTypeForm.vue   | 32 +++++++++-
 .../views/zyclothsample/ZyClothSampleList.vue |  4 +-
 .../modules/ZyClothSampleForm.vue             | 63 ++++++++++++-------
 .../controller/ZyAccessoriesController.java   | 24 ++++++-
 .../ZyAccessoriesTypeController.java          | 14 +++++
 .../accessories/entity/ZyAccessories.java     |  2 +-
 .../mapper/ZyAccessoriesMapper.java           |  3 +
 .../mapper/ZyAccessoriesTypeMapper.java       |  3 +
 .../service/IZyAccessoriesService.java        |  1 +
 .../service/IZyAccessoriesTypeService.java    |  1 +
 .../impl/ZyAccessoriesServiceImpl.java        |  7 +++
 .../impl/ZyAccessoriesTypeServiceImpl.java    |  7 +++
 .../fabric/controller/ZyFabricController.java | 10 +++
 .../controller/ZyFabricTypeController.java    |  9 +++
 .../modules/demo/fabric/entity/ZyFabric.java  |  2 +-
 .../demo/fabric/mapper/ZyFabricMapper.java    |  4 ++
 .../fabric/mapper/ZyFabricTypeMapper.java     |  3 +
 .../demo/fabric/service/IZyFabricService.java |  2 +
 .../fabric/service/IZyFabricTypeService.java  |  1 +
 .../service/impl/ZyFabricServiceImpl.java     |  5 ++
 .../service/impl/ZyFabricTypeServiceImpl.java |  7 +++
 .../controller/ZyClothSampleController.java   | 11 ++++
 .../zyclothsample/entity/ZyClothSample.java   |  3 +-
 .../mapper/ZyClothSampleMapper.java           |  3 +
 .../service/IZyClothSampleService.java        |  1 +
 .../impl/ZyClothSampleServiceImpl.java        |  7 +++
 29 files changed, 259 insertions(+), 45 deletions(-)

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 b51ff49c..88aa62ba 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="id,contents"
+                org-fields="nums,contents"
                 dest-fields="typeId,typeName"
                 code="zy_accessories_type"
                 :multi="false"
@@ -20,7 +20,7 @@
 
           <a-col :span="24">
             <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
-              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>
+              <a-input v-model="model.nums" placeholder="请输入编号" disabled  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -83,6 +83,7 @@
     data () {
       return {
         model:{
+          nums:''
          },
         labelCol: {
           xs: { span: 24 },
@@ -107,7 +108,8 @@
         url: {
           add: "/accessories/zyAccessories/add",
           edit: "/accessories/zyAccessories/edit",
-          queryById: "/accessories/zyAccessories/queryById"
+          queryById: "/accessories/zyAccessories/queryById",
+          sort:"/accessories/zyAccessories/sort"
         }
       }
     },
@@ -159,8 +161,19 @@
       },
       popupCallback(value,row){
         this.model = Object.assign(this.model, row);
-        console.log(row);
-      },
+        var n=10;
+        console.log(this.model)
+        getAction(this.url.sort, {id:this.model.typeId}).then((res)=>{
+          console.log(res)
+          var num=parseInt(res.result,10)+1
+          num=num.toString()
+          while(num.length<n){
+            num="0"+num
+          }
+          this.model.nums="FL"+this.model.typeId+num;
+          console.log(this.model.nums)
+        // console.log(row);
+      })},
     }
   }
 </script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesTypeForm.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesTypeForm.vue
index 5eaba65e..046c9ac9 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesTypeForm.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesTypeForm.vue
@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
-              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>
+              <a-input v-model="model.nums" placeholder="请输入编号" disabled ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -39,6 +39,7 @@
     data () {
       return {
         model:{
+          nums:''
          },
         labelCol: {
           xs: { span: 24 },
@@ -54,7 +55,8 @@
         url: {
           add: "/accessories/zyAccessoriesType/add",
           edit: "/accessories/zyAccessoriesType/edit",
-          queryById: "/accessories/zyAccessoriesType/queryById"
+          queryById: "/accessories/zyAccessoriesType/queryById",
+          weiyi:"/accessories/zyAccessoriesType/weiyi"
         }
       }
     },
@@ -64,6 +66,15 @@
       },
     },
     created () {
+      var n=4
+      getAction(this.url.weiyi,null).then((res)=>{
+        var num=parseInt(res.message,10)+1
+        num=num.toString()
+        while(num.length<n){
+          num="0"+num
+        }
+        this.model.nums=num;
+      })
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
diff --git a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
index 22317598..f87c343b 100644
--- a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
+++ b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
@@ -8,7 +8,7 @@
               <j-popup
                 v-model="model.typeName"
                 field="typeName"
-                org-fields="id,content"
+                org-fields="nums,content"
                 dest-fields="typeId,typeName"
                 code="zy_fabric_type"
                 :multi="false"
@@ -17,9 +17,14 @@
               <a-input v-model="model.typeId" hidden />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
+              <j-search-select-tag v-model="model.material" dict="material" @change="gaibian" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fabricNumber">
-              <a-input v-model="model.fabricNumber" placeholder="请输入编号"  ></a-input>
+              <a-input v-model="model.fabricNumber" placeholder="请输入编号"  disabled></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -37,11 +42,11 @@
               <j-search-select-tag v-model="model.pattern" dict="pattern"  />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
-              <j-search-select-tag v-model="model.material" dict="material"  />
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">-->
+<!--              <j-search-select-tag v-model="model.material" dict="material"  />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
 <!--          <a-col :span="24">-->
 <!--            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">-->
 <!--              <a-input v-model="model.description" placeholder="请输入描述"  ></a-input>-->
@@ -157,6 +162,7 @@
         model:{
           unit : '1',
           status : '1',
+          fabricNumber:'',
          },
         labelCol: {
           xs: { span: 24 },
@@ -199,7 +205,8 @@
         url: {
           add: "/fabric/zyFabric/add",
           edit: "/fabric/zyFabric/edit",
-          queryById: "/fabric/zyFabric/queryById"
+          queryById: "/fabric/zyFabric/queryById",
+          sort:"/fabric/zyFabric/sort"
         }
       }
     },
@@ -217,6 +224,20 @@
       add () {
         this.edit(this.modelDefault);
       },
+      gaibian(){
+        var n=10;
+        console.log(this.model)
+        getAction(this.url.sort,this.model).then((res)=>{
+            console.log(res)
+            var num=parseInt(res.result,10)+1
+            num=num.toString()
+            while(num.length<n){
+              num="0"+num
+            }
+            this.model.fabricNumber="ML"+this.model.typeId+this.model.material+num;
+            console.log(this.model.typeId)
+      })
+      },
       edit (record) {
         this.model = Object.assign({}, record);
         this.visible = true;
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 d1b276dd..22aa1bf0 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
@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
-              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>
+              <a-input v-model="model.nums" placeholder="请输入编号" disabled ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -22,7 +22,7 @@
 <script>
 
   import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
+  import {randomString, validateDuplicateValue} from '@/utils/util'
 
   export default {
     name: 'ZyFabricTypeForm',
@@ -39,6 +39,7 @@
     data () {
       return {
         model:{
+          nums:''
          },
         labelCol: {
           xs: { span: 24 },
@@ -60,7 +61,8 @@
         url: {
           add: "/fabric/zyFabricType/add",
           edit: "/fabric/zyFabricType/edit",
-          queryById: "/fabric/zyFabricType/queryById"
+          queryById: "/fabric/zyFabricType/queryById",
+          weiyi:"/fabric/zyFabricType/weiyi"
         }
       }
     },
@@ -70,7 +72,21 @@
       },
     },
     created () {
+     //使用随机的时候到后期数据量大时有可能出现问题，建议使用一套规则，后期需要添加循环判断，存在就让它重新生成，这里只写了两层，理论上是while循环
+     //    this.model.nums=randomString(4)
+      var n=4
+        getAction(this.url.weiyi,{id:this.model.nums}).then((res)=>{
+          var num=parseInt(res.message,10)+1
+          num=num.toString()
+          while(num.length<n){
+            num="0"+num
+          }
+          this.model.nums=num;
+          console.log(num)
+      })
+
        //备份model原始值
+      console.log(this.model.nums)
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
@@ -81,6 +97,16 @@
         this.model = Object.assign({}, record);
         this.visible = true;
       },
+       randomString(len) {
+    　　len = len || 32;
+     　　var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';    /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
+     　　var maxPos = $chars.length;
+     　　var pwd = '';
+     　　for (i = 0; i < len; i++) {
+       　　　　pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
+       　　}
+     　　return pwd;
+     },
       submitForm () {
         const that = this;
         // 触发表单验证
diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue
index 57d22e83..92c18b29 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue
@@ -215,9 +215,9 @@ export default {
         //   scopedSlots: {customRender: 'action1'}
         // },
         {
-          title: '用户名',
+          title: '企业',
           align: "center",
-          dataIndex: 'userId'
+          dataIndex: 'userId_dictText'
         },
         {
           title: '创建时间',
diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
index 935aac1b..9f095782 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
@@ -4,17 +4,18 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
-              <!--              <a-input v-model="model.nums || this.nums" placeholder="请输入编号"></a-input>-->
-              <a-input v-model="model.nums" placeholder="请输入编号"></a-input>
+            <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
+              <j-select-depart v-model="model.userId"  />
             </a-form-model-item>
           </a-col>
+
           <!--关联服装款式表 zy_cloths_style 关联列：名称 传值id-->
           <a-col :span="24">
             <a-form-model-item label="款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">
               <j-dict-select-tag v-model="model.styleId" placeholder="请输入款式"
-                                 dict-code="zy_cloths_style,style_names,id"></j-dict-select-tag>
+                                 dict-code="zy_cloths_style,style_names,nums"></j-dict-select-tag>
             </a-form-model-item>
+<!--         编码也是唯一的，和id一样    -->
           </a-col>
 
           <a-col :span="24">
@@ -23,22 +24,27 @@
 <!--              <j-dict-select-tag v-model="model.stylemodelId" placeholder="请输入款式型号"-->
 <!--                                 dict-code="zy_style_model,model_number,model_number"></j-dict-select-tag>-->
               <j-dict-select-tag v-model="model.stylemodelId" placeholder="请选择款式型号"
-                                 dictCode="modenumber"></j-dict-select-tag>
+                                 dictCode="modenumber" @change="gaibian"></j-dict-select-tag>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
+              <!--              <a-input v-model="model.nums || this.nums" placeholder="请输入编号"></a-input>-->
+              <a-input v-model="model.nums" placeholder="请输入编号" disabled></a-input>
             </a-form-model-item>
           </a-col>
-
           <!--<j-dict-select-tag v-model="model.modelSample" placeholder="请选择模块样板"-->
           <!--                    dict-code="zy_module_sample, module_name, id"></j-dict-select-tag>-->
           <!--               <j-search-select-tag v-model="model.modelSample" dict="zy_module_sample" dictText="module_name", dictCode="id"  />-->
           <!--  </a-form-model-item>-->
 
-          <a-col :span="24">
-            <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <!--              <a-input v-model="model.userId" placeholder="请输入用户名"></a-input>-->
-              <j-dict-select-tag v-model="model.userId" placeholder="请输入用户名"
-                                 dict-code="sys_user,username,username"></j-dict-select-tag>
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">-->
+<!--              &lt;!&ndash;              <a-input v-model="model.userId" placeholder="请输入用户名"></a-input>&ndash;&gt;-->
+<!--              <j-dict-select-tag v-model="model.userId" placeholder="请输入用户名"-->
+<!--                                 dict-code="sys_user,username,username"></j-dict-select-tag>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
 
           <a-col :span="24">
             <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descr">
@@ -81,7 +87,9 @@ export default {
       selectedKey: '', // 款式id
       typeid: '', // 型号,
       serialNumber: '', // 顺序号
-      model: {},
+      model: {
+        nums:'',
+      },
       labelCol: {
         xs: {span: 24},
         sm: {span: 5},
@@ -93,12 +101,12 @@ export default {
       confirmLoading: false,
       /*效验规则*/
       validatorRules: {
-        nums: [
-        //{pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{4}$/, message: '4wei'},
-          { required:true, message: '编号不能为空'},
-          { pattern: /^[0-9A-Za-z]{0,10}$/, message: '编号太长'},
-        //{pattern: /^(?=.*([0-9a-zA-Z]){5}).[A-Za-z0-9]+$/, message: '编号为四位'},
-        ],
+        // nums: [
+        // //{pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{4}$/, message: '4wei'},
+        //   { required:true, message: '编号不能为空'},
+        //   { pattern: /^[0-9A-Za-z]{0,20}$/, message: '编号太长'},
+        // //{pattern: /^(?=.*([0-9a-zA-Z]){5}).[A-Za-z0-9]+$/, message: '编号为四位'},
+        // ],
         styleId: [
           {required: true, message: '款式不能为空'},
         ],
@@ -117,6 +125,7 @@ export default {
         add: "/zyclothsample/zyClothSample/add",
         edit: "/zyclothsample/zyClothSample/edit",
         queryById: "/zyclothsample/zyClothSample/queryById",
+        sort:"/zyclothsample/zyClothSample/sort"
       }
     }
   },
@@ -141,7 +150,19 @@ export default {
       this.edit(this.modelDefault);
     },
     //
-
+    gaibian(){
+      var n=3;
+      console.log(this.model)
+      getAction(this.url.sort,this.model).then((res)=>{
+          console.log(res)
+          var num=parseInt(res.result,10)+1
+          num=num.toString()
+          while(num.length<n){
+            num="0"+num
+          }
+          this.model.nums=this.model.styleId+this.model.stylemodelId+num;
+        console.log(  this.model.nums)
+    })},
     // 款式select改变的回调
     handleSelect(selectedKeys) {
       this.selectedKey = selectedKeys;
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 f7d33790..1d5bb51b 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
@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.fabric.entity.ZyFabric;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -83,6 +84,12 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
 	@ApiOperation(value="zy_accessories-添加", notes="zy_accessories-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyAccessories zyAccessories) {
+		QueryWrapper queryWrapper=new QueryWrapper();
+		queryWrapper.eq("contents",zyAccessories.getContents());
+		int a= zyAccessoriesService.count(queryWrapper);
+		if(a>=1){
+			return Result.error("名称重复，请修改后重试！！");
+		}
 		zyAccessoriesService.save(zyAccessories);
 		return Result.OK("添加成功！");
 	}
@@ -97,6 +104,12 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
 	@ApiOperation(value="zy_accessories-编辑", notes="zy_accessories-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody ZyAccessories zyAccessories) {
+		QueryWrapper queryWrapper=new QueryWrapper();
+		queryWrapper.eq("contents",zyAccessories.getContents());
+		int a= zyAccessoriesService.count(queryWrapper);
+		if(a>=1){
+			return Result.error("名称重复，请修改后重试！！");
+		}
 		zyAccessoriesService.updateById(zyAccessories);
 		return Result.OK("编辑成功!");
 	}
@@ -168,5 +181,14 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ZyAccessories.class);
     }
-
+	 @AutoLog(value = "排序")
+	 @ApiOperation(value="排序", notes="排序")
+	 @GetMapping(value = "/sort")
+	 public Result<?> sort(@RequestParam(name="id",required=true) String id) {
+		 String s=zyAccessoriesService.findSort(id);
+		 if(s==null){
+			 return Result.OK(0);
+		 }else
+			 return Result.OK(s.substring(6));
+	 }
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java
index 476d310e..4d6992c1 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java
@@ -83,6 +83,11 @@ public class ZyAccessoriesTypeController extends JeecgController<ZyAccessoriesTy
 	@ApiOperation(value="zy_accessories_type-添加", notes="zy_accessories_type-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyAccessoriesType zyAccessoriesType) {
+		QueryWrapper queryWrapper=new QueryWrapper();
+		   queryWrapper.eq("contents",zyAccessoriesType.getContents());
+		   int a=zyAccessoriesTypeService.count(queryWrapper);
+		   if(a!=0)
+			   return Result.error("名称重复，请重试！！！");
 		zyAccessoriesTypeService.save(zyAccessoriesType);
 		return Result.OK("添加成功！");
 	}
@@ -169,4 +174,13 @@ public class ZyAccessoriesTypeController extends JeecgController<ZyAccessoriesTy
         return super.importExcel(request, response, ZyAccessoriesType.class);
     }
 
+	 @GetMapping(value = "/weiyi")
+	 public Result<?> weiyi() {
+
+		 String a=zyAccessoriesTypeService.sort();
+		 if(a==null){
+			 return Result.ok(0);
+		 }
+		 return Result.ok(a);
+	 }
 }
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 8d718db0..258decea 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,7 +38,7 @@ public class ZyAccessories implements Serializable {
 	/**类型id*/
 	@Excel(name = "类型id", width = 15)
     @ApiModelProperty(value = "类型id")
-    @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id")
+    @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "nums")
     private java.lang.String typeId;
 	/**编号*/
 	@Excel(name = "编号", width = 15)
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesMapper.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesMapper.java
index 097a36a6..4fe05db1 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesMapper.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesMapper.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.demo.accessories.entity.ZyAccessories;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZyAccessoriesMapper extends BaseMapper<ZyAccessories> {
 
+    @Select("select nums from zy_accessories where type_id=#{id} order by nums desc limit 0,1 ")
+    String findSort(String id);
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesTypeMapper.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesTypeMapper.java
index 395e9ba1..38a9b292 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesTypeMapper.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesTypeMapper.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.demo.accessories.entity.ZyAccessoriesType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZyAccessoriesTypeMapper extends BaseMapper<ZyAccessoriesType> {
 
+    @Select("select nums from zy_accessories_type order by nums desc limit 0,1")
+    String sort();
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesService.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesService.java
index 6e7f95d8..48609354 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesService.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesService.java
@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IZyAccessoriesService extends IService<ZyAccessories> {
 
+    String findSort(String id);
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesTypeService.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesTypeService.java
index d3d35c8f..6473ffd6 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesTypeService.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesTypeService.java
@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IZyAccessoriesTypeService extends IService<ZyAccessoriesType> {
 
+    String sort();
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesServiceImpl.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesServiceImpl.java
index f6ff929d..9cfabcaa 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.service.impl;
 import org.jeecg.modules.demo.accessories.entity.ZyAccessories;
 import org.jeecg.modules.demo.accessories.mapper.ZyAccessoriesMapper;
 import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyAccessoriesServiceImpl extends ServiceImpl<ZyAccessoriesMapper, ZyAccessories> implements IZyAccessoriesService {
 
+    @Autowired
+    ZyAccessoriesMapper zyAccessoriesMapper;
+    @Override
+    public String findSort(String id) {
+        return zyAccessoriesMapper.findSort(id);
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesTypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesTypeServiceImpl.java
index 16f315ba..7ee8b1f6 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesTypeServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesTypeServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.service.impl;
 import org.jeecg.modules.demo.accessories.entity.ZyAccessoriesType;
 import org.jeecg.modules.demo.accessories.mapper.ZyAccessoriesTypeMapper;
 import org.jeecg.modules.demo.accessories.service.IZyAccessoriesTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyAccessoriesTypeServiceImpl extends ServiceImpl<ZyAccessoriesTypeMapper, ZyAccessoriesType> implements IZyAccessoriesTypeService {
 
+    @Autowired
+    ZyAccessoriesTypeMapper zyAccessoriesTypeMapper;
+    @Override
+    public String sort() {
+        return zyAccessoriesTypeMapper.sort();
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java
index 38aac068..d5556303 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java
@@ -357,5 +357,15 @@ public class ZyFabricController extends JeecgController<ZyFabric, IZyFabricServi
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ZyFabric.class);
     }
+	 @AutoLog(value = "排序")
+	 @ApiOperation(value="排序", notes="排序")
+	 @GetMapping(value = "/sort")
+	 public Result<?> sort(ZyFabric zyFabric) {
+		 String s=zyFabricService.findSort(zyFabric.getTypeId(),zyFabric.getMaterial());
+		 if(s==null){
+			 return Result.OK(0);
+		 }else
+			 return Result.OK(s.substring(6));
+	 }
 
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricTypeController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricTypeController.java
index 10bd9486..fb55f3c7 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricTypeController.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricTypeController.java
@@ -201,4 +201,13 @@ public class ZyFabricTypeController extends JeecgController<ZyFabricType, IZyFab
         return super.importExcel(request, response, ZyFabricType.class);
     }
 
+	 @GetMapping(value = "/weiyi")
+	 public Result<?> weiyi(@RequestParam(name="id",required=true) String id) {
+
+	   String a=zyFabricTypeService.sort();
+	   if(a==null){
+		   return Result.ok(0);
+	   }
+		return Result.ok(a);
+	 }
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java
index 68fd858e..9faf2297 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java
@@ -67,7 +67,7 @@ public class ZyFabric implements Serializable {
     private java.lang.String imageUrl;
     /**面料类型id*/
     @Excel(name = "类型", width = 15 , dictTable = "zy_fabric_type", dicText = "content", dicCode = "id")
-    @Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "id")
+    @Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "nums")
     @ApiModelProperty(value = "类型")
     private java.lang.String typeId;
 
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricMapper.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricMapper.java
index c6830c89..c6e12195 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricMapper.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricMapper.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.fabric.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.demo.fabric.entity.ZyFabric;
 import org.jeecg.modules.demo.statistic.vo.StaticDayVo;
@@ -53,4 +54,7 @@ public interface ZyFabricMapper extends BaseMapper<ZyFabric> {
 
     @Select("select id from zy_fabric_type where content like #{s}")
     List<String> findAllid(String s);
+
+    @Select("select fabric_number from zy_fabric where type_id=#{typeId} and material=#{material} order by fabric_number desc limit 0,1")
+    String findSort(@Param("typeId") String typeId, @Param("material") String material);
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricTypeMapper.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricTypeMapper.java
index 9e101ddc..e095419f 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricTypeMapper.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricTypeMapper.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.fabric.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.demo.fabric.entity.ZyFabricType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZyFabricTypeMapper extends BaseMapper<ZyFabricType> {
 
+    @Select("select nums from zy_fabric_type order by nums desc limit 0,1")
+    String sort();
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricService.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricService.java
index 13a23146..a03c8005 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricService.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricService.java
@@ -70,4 +70,6 @@ public interface IZyFabricService extends IService<ZyFabric> {
         public StaticThreeVo staticThreeNum();
 
     List<String> findAllId(String s);
+
+    String findSort(String typeId, String material);
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricTypeService.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricTypeService.java
index d8ca1d74..2423afea 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricTypeService.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricTypeService.java
@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IZyFabricTypeService extends IService<ZyFabricType> {
 
+    String sort();
 }
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricServiceImpl.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricServiceImpl.java
index 28b1292a..e8658558 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricServiceImpl.java
@@ -180,6 +180,11 @@ public class ZyFabricServiceImpl extends ServiceImpl<ZyFabricMapper, ZyFabric> i
         return zyFabricMapper.findAllid(s);
     }
 
+    @Override
+    public String findSort(String typeId, String material) {
+        return zyFabricMapper.findSort(typeId,material);
+    }
+
     /**
      * 逻辑：单个货品的扫码出库，旧的删掉对应的库存表中的库存减一，生成新的二维码
      * @param fabric
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricTypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricTypeServiceImpl.java
index 3e0c213d..8e32423f 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricTypeServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricTypeServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.fabric.service.impl;
 import org.jeecg.modules.demo.fabric.entity.ZyFabricType;
 import org.jeecg.modules.demo.fabric.mapper.ZyFabricTypeMapper;
 import org.jeecg.modules.demo.fabric.service.IZyFabricTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyFabricTypeServiceImpl extends ServiceImpl<ZyFabricTypeMapper, ZyFabricType> implements IZyFabricTypeService {
 
+    @Autowired
+    ZyFabricTypeMapper zyFabricTypeMapper;
+    @Override
+    public String sort() {
+        return zyFabricTypeMapper.sort();
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/controller/ZyClothSampleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/controller/ZyClothSampleController.java
index 8c9f6b6a..587f20eb 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/controller/ZyClothSampleController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/controller/ZyClothSampleController.java
@@ -185,4 +185,15 @@ public class ZyClothSampleController extends JeecgController<ZyClothSample, IZyC
         return super.importExcel(request, response, ZyClothSample.class);
     }
 
+	 @AutoLog(value = "排序")
+	 @ApiOperation(value="排序", notes="排序")
+	 @GetMapping(value = "/sort")
+	 public Result<?> sort(ZyClothSample zyClothSample) {
+          String s=zyClothSampleService.findSort(zyClothSample.getStyleId(),zyClothSample.getStylemodelId());
+		  if(s==null){
+			  return Result.OK(0);
+		  }else
+		 return Result.OK(s.substring(21));
+	 }
+
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java
index fad0c2f7..64a04bb6 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java
@@ -47,7 +47,7 @@ public class ZyClothSample implements Serializable {
      */
     @Excel(name = "款式", width = 15)
     @ApiModelProperty(value = "款式")
-    @Dict(dicCode = "id",dictTable = "zy_cloths_style",dicText = "style_names")
+    @Dict(dicCode = "nums",dictTable = "zy_cloths_style",dicText = "style_names")
     private String styleId;
     /**型号*/
     @Excel(name = "型号", width = 15)
@@ -69,6 +69,7 @@ public class ZyClothSample implements Serializable {
     /**用户*/
     @Excel(name = "用户", width = 15)
     @ApiModelProperty(value = "用户")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
     private String userId;
     /**创建日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java
index d9e80ba0..e77c0c66 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.zyclothsample.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.zyclothsample.entity.ZyClothSample;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -15,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface ZyClothSampleMapper extends BaseMapper<ZyClothSample> {
 
 
+    @Select("select nums from zy_cloth_sample where style_id=#{styleId} and stylemodel_id=#{stylemodelId} order by nums desc limit 0,1")
+    String findSort(@Param("styleId") String styleId, @Param("stylemodelId") String stylemodelId);
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java
index 6ace1925..8c63f4cd 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java
@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IZyClothSampleService extends IService<ZyClothSample> {
 
+    String findSort(String styleId, String stylemodelId);
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java
index 6684fbfa..9752a8f9 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.zyclothsample.service.impl;
 import org.jeecg.modules.zyclothsample.entity.ZyClothSample;
 import org.jeecg.modules.zyclothsample.mapper.ZyClothSampleMapper;
 import org.jeecg.modules.zyclothsample.service.IZyClothSampleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyClothSampleServiceImpl extends ServiceImpl<ZyClothSampleMapper, ZyClothSample> implements IZyClothSampleService {
 
+    @Autowired
+    ZyClothSampleMapper zyClothSampleMapper;
+    @Override
+    public String findSort(String styleId, String stylemodelId) {
+        return zyClothSampleMapper.findSort(styleId,stylemodelId);
+    }
 }

From 9203804650f9427dde40bd4f23592a389d871b9d Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Tue, 6 Dec 2022 15:41:21 +0800
Subject: [PATCH 6/6] =?UTF-8?q?2022-12-06=20=E8=B5=B5=E7=8E=89=E7=91=9E=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/process/ZyClothsComponentList.vue   |   6 +-
 .../controller/ZyClothsTypeController.java    | 225 +++++++++---------
 2 files changed, 121 insertions(+), 110 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
index 61d22267..711921fa 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
@@ -13,9 +13,9 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('zy_cloths_component')">导出</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>
+<!--      <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">
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
index aa81015e..4419349c 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
@@ -9,6 +9,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -27,6 +28,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -36,135 +38,144 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+/**
  * @Description: zy_cloths_type
  * @Author: jeecg-boot
- * @Date:   2021-11-10
+ * @Date: 2021-11-10
  * @Version: V1.0
  */
-@Api(tags="zy_cloths_type")
+@Api(tags = "zy_cloths_type")
 @RestController
 @RequestMapping("/base/zyClothsType")
 @Slf4j
 public class ZyClothsTypeController extends JeecgController<ZyClothsType, IZyClothsTypeService> {
-	@Autowired
-	private IZyClothsTypeService zyClothsTypeService;
+    @Autowired
+    private IZyClothsTypeService zyClothsTypeService;
 
-	/**
-	 * 分页列表查询
-	 *
-	 * @param zyClothsType
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "zy_cloths_type-分页列表查询")
-	@ApiOperation(value="zy_cloths_type-分页列表查询", notes="zy_cloths_type-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<?> queryPageList(ZyClothsType zyClothsType,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<ZyClothsType> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
-		Page<ZyClothsType> page = new Page<ZyClothsType>(pageNo, pageSize);
-		IPage<ZyClothsType> pageList = zyClothsTypeService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
+    /**
+     * 分页列表查询
+     *
+     * @param zyClothsType
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "zy_cloths_type-分页列表查询")
+    @ApiOperation(value = "zy_cloths_type-分页列表查询", notes = "zy_cloths_type-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(ZyClothsType zyClothsType,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        QueryWrapper<ZyClothsType> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
+        Page<ZyClothsType> page = new Page<ZyClothsType>(pageNo, pageSize);
+        IPage<ZyClothsType> pageList = zyClothsTypeService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
 
-	/**
-	 *   添加
-	 *
-	 * @param zyClothsType
-	 * @return
-	 */
-	@AutoLog(value = "zy_cloths_type-添加")
-	@ApiOperation(value="zy_cloths_type-添加", notes="zy_cloths_type-添加")
-	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody ZyClothsType zyClothsType) {
-		//生成编号 nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）在service层处理
-		zyClothsType.setNums(zyClothsTypeService.generateNumber());
-		zyClothsTypeService.save(zyClothsType);
-		return Result.OK("添加成功！");
-	}
+    /**
+     * 添加
+     *
+     * @param zyClothsType
+     * @return
+     */
+    @AutoLog(value = "zy_cloths_type-添加")
+    @ApiOperation(value = "zy_cloths_type-添加", notes = "zy_cloths_type-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody ZyClothsType zyClothsType) {
+        //类型名称输入时没有最大长度限制，提交时才提示。前端校验、后台校验
+        //type_name，类型名称，varchar，50，非空，同类型下不重复
+        String typeName = zyClothsType.getTypeName();
+        if (!StringUtils.hasText(typeName)) {
+            return Result.error("类型名称 不能为空");
+        }
+        if (typeName.length() > 10) {
+            return Result.error("类型名称长度不能超过10");
+        }
+        //生成编号 nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）在service层处理
+        zyClothsType.setNums(zyClothsTypeService.generateNumber());
+        zyClothsTypeService.save(zyClothsType);
+        return Result.OK("添加成功！");
+    }
 
-	/**
-	 *  编辑
-	 *
-	 * @param zyClothsType
-	 * @return
-	 */
-	@AutoLog(value = "zy_cloths_type-编辑")
-	@ApiOperation(value="zy_cloths_type-编辑", notes="zy_cloths_type-编辑")
-	@PutMapping(value = "/edit")
-	public Result<?> edit(@RequestBody ZyClothsType zyClothsType) {
-		zyClothsTypeService.updateById(zyClothsType);
-		return Result.OK("编辑成功!");
-	}
+    /**
+     * 编辑
+     *
+     * @param zyClothsType
+     * @return
+     */
+    @AutoLog(value = "zy_cloths_type-编辑")
+    @ApiOperation(value = "zy_cloths_type-编辑", notes = "zy_cloths_type-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody ZyClothsType zyClothsType) {
+        zyClothsTypeService.updateById(zyClothsType);
+        return Result.OK("编辑成功!");
+    }
 
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "zy_cloths_type-通过id删除")
-	@ApiOperation(value="zy_cloths_type-通过id删除", notes="zy_cloths_type-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		zyClothsTypeService.removeById(id);
-		return Result.OK("删除成功!");
-	}
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "zy_cloths_type-通过id删除")
+    @ApiOperation(value = "zy_cloths_type-通过id删除", notes = "zy_cloths_type-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        zyClothsTypeService.removeById(id);
+        return Result.OK("删除成功!");
+    }
 
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "zy_cloths_type-批量删除")
-	@ApiOperation(value="zy_cloths_type-批量删除", notes="zy_cloths_type-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.zyClothsTypeService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "zy_cloths_type-批量删除")
+    @ApiOperation(value = "zy_cloths_type-批量删除", notes = "zy_cloths_type-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.zyClothsTypeService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
 
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "zy_cloths_type-通过id查询")
-	@ApiOperation(value="zy_cloths_type-通过id查询", notes="zy_cloths_type-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		ZyClothsType zyClothsType = zyClothsTypeService.getById(id);
-		if(zyClothsType==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(zyClothsType);
-	}
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "zy_cloths_type-通过id查询")
+    @ApiOperation(value = "zy_cloths_type-通过id查询", notes = "zy_cloths_type-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+        ZyClothsType zyClothsType = zyClothsTypeService.getById(id);
+        if (zyClothsType == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(zyClothsType);
+    }
 
     /**
-    * 导出excel
-    *
-    * @param request
-    * @param zyClothsType
-    */
+     * 导出excel
+     *
+     * @param request
+     * @param zyClothsType
+     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ZyClothsType zyClothsType) {
         return super.exportXls(request, zyClothsType, ZyClothsType.class, "制衣类型表");
     }
 
     /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ZyClothsType.class);