Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue

@@ -124,9 +124,9 @@
             }
           },
           {
-            title:'类型id',
+            title:'类型',
             align:"center",
-            dataIndex: 'typeId'
+            dataIndex: 'typeId_dictText'
           },
           {
             title:'编号',

ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue

@@ -4,10 +4,20 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="类型id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
-              <a-input v-model="model.typeId" placeholder="请输入类型id"  ></a-input>
+            <a-form-model-item label="辅料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
+              <j-popup
+                v-model="model.typeName"
+                field="typeName"
+                org-fields="id,contents"
+                dest-fields="typeId,typeName"
+                code="zy_accessories_type"
+                :multi="false"
+                @input="popupCallback"
+              />
+              <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="nums">
               <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>
@@ -19,8 +29,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="picture">
-              <a-input v-model="model.picture" placeholder="请输入图片"  ></a-input>
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
+              <j-image-upload isMultiple  v-model="model.picture" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -84,6 +94,15 @@
         },
         confirmLoading: false,
         validatorRules: {
+          typeId: [
+            { required: true, message: '请选择类型!'},
+          ],
+          nums: [
+            { required: true, message: '请输入编号!'},
+          ],
+          contents: [
+            { required: true, message: '请输入名称!'},
+          ],
         },
         url: {
           add: "/accessories/zyAccessories/add",
@@ -138,6 +157,10 @@
 
         })
       },
+      popupCallback(value,row){
+        this.model = Object.assign(this.model, row);
+        console.log(row);
+      },
     }
   }
 </script>

ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue

@@ -6,14 +6,15 @@
           <a-col :span="24">
             <a-form-model-item label="面料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
               <j-popup
-                v-model="model.typeId"
-                field="id"
-                org-fields="id"
-                dest-fields="id"
+                v-model="model.typeName"
+                field="typeName"
+                org-fields="id,content"
+                dest-fields="typeId,typeName"
                 code="zy_fabric_type"
                 :multi="false"
                 @input="popupCallback"
               />
+              <a-input v-model="model.typeId" hidden />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -53,7 +54,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
-              <a-input-number v-model="model.money" placeholder="请输入单价" style="width: 100%" />
+              <a-input-number v-model="model.money" placeholder="请输入单价" :precision="2" :min="0" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -136,6 +137,7 @@
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
   import OnlineCamera from './Components/OnlineCamera'
+  import pick from 'lodash.pick'
 
   export default {
     name: 'ZyFabricForm',
@@ -181,14 +183,14 @@
           name: [
             { required: true, message: '请输入名称!'},
           ],
-          money: [
-            { required: false},
-            { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
-          ],
-          retailPrice: [
-            { required: false},
-            { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
-          ],
+          // money: [
+          //   { required: false},
+          //   { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
+          // ],
+          // retailPrice: [
+          //   { required: false},
+          //   { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
+          // ],
           location: [
             { required: false},
             { pattern: /^.{0,30}$/, message: '长度不能超过30位字符'},
@@ -256,6 +258,10 @@
       changeOnlineVisible(value){
         this.model.imageUrl=value;
       },
+      popupCallback(value,row){
+        this.model = Object.assign(this.model, row);
+      },
+
 
     }
   }

ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue

@@ -71,6 +71,19 @@
         },
         confirmLoading: false,
         validatorRules: {
+          freq: [
+            { required: true, message: '请输入频率!'},
+          ],
+          machineTmu: [
+            { required: true, message: '请输入机器TMU!'},
+          ],
+          manualTmu: [
+            { required: true, message: '请输入手工TMU!'},
+          ],
+          nums: [
+            { required: true, message: '请输入编号!'},
+          ],
+
         },
         url: {
           add: "/base/zyClothAction/add",

ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue

@@ -15,12 +15,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="工艺描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processDescribe">
-              <a-input v-model="model.processDescribe" placeholder="请输入工艺描述"  ></a-input>
+              <a-textarea v-model="model.processDescribe" rows="4" placeholder="请输入工艺描述"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="做工说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mkExplain">
-              <a-input v-model="model.mkExplain" placeholder="请输入做工说明"  ></a-input>
+              <a-textarea v-model="model.mkExplain" rows="4" placeholder="请输入做工说明"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -225,6 +225,14 @@
            fabricNum: [
               { required: true, message: '请输入面料代码!'},
            ],
+
+          processCode: [
+            { required: true, message: '请输入工序代码!'},
+          ],
+          processName: [
+            { required: true, message: '请输入工序名称!'},
+          ],
+
         },
         url: {
           add: "/base/zyProcess/add",

ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue

@@ -6,27 +6,28 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="编号">
-              <a-input placeholder="请输入编号" v-model="queryParam.nums" ></a-input>
+              <a-input placeholder="请输入编号" v-model="queryParam.nums"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="形式">
-              <j-dict-select-tag placeholder="请选择形式" dictCode="style_shape" v-model="queryParam.shape" ></j-dict-select-tag>
+              <j-dict-select-tag placeholder="请选择形式" dictCode="style_shape"
+                                 v-model="queryParam.shape"></j-dict-select-tag>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="名称">
-              <a-input placeholder="请输入名称" v-model="queryParam.styleNames" ></a-input>
+              <a-input placeholder="请输入名称" v-model="queryParam.styleNames"></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.specification" ></a-input>
+              <a-input placeholder="请输入规格" v-model="queryParam.specification"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业名称">
-              <j-select-depart placeholder="请输入企业名称"  v-model="queryParam.enterpriseId"   />
+              <j-select-depart placeholder="请输入企业名称" v-model="queryParam.enterpriseId"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -44,23 +45,29 @@
     <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-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"><a-icon type="delete"/>删除</a-menu-item>
+          <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-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>项
+        <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>
 
@@ -83,7 +90,8 @@
         </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;"/>
+          <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>
@@ -99,21 +107,21 @@
         </template>
 
         <span slot="action1" slot-scope="text, record">
-           <a @click="jumpPage1(record)" >管理模块</a>
-           <a-divider type="vertical" />
-           <a @click="jumpPage2(record)" >管理面料</a>
-           <a-divider type="vertical" />
-           <a @click="jumpPage3(record)" >管理辅料</a>
-           <a-divider type="vertical" />
-           <a @click="jumpPage4(record)" >管理型号</a>
-           <a-divider type="vertical" />
-           <a @click="jumpPage5(record)" >管理工序</a>
+           <a @click="jumpPage1(record)">管理模块</a>
+           <a-divider type="vertical"/>
+           <a @click="jumpPage2(record)">管理面料</a>
+           <a-divider type="vertical"/>
+           <a @click="jumpPage3(record)">管理辅料</a>
+           <a-divider type="vertical"/>
+           <a @click="jumpPage4(record)">管理型号</a>
+           <a-divider type="vertical"/>
+           <a @click="jumpPage5(record)">管理工序</a>
         </span>
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a @click="handleDetail(record)">详情</a>
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
@@ -128,18 +136,18 @@
 
 <script>
 
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ZyClothsStyleModal from './modules/ZyClothsStyleModal'
+import '@/assets/less/TableExpand.less'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import ZyClothsStyleModal from './modules/ZyClothsStyleModal'
 
-  export default {
+export default {
   name: 'ZyClothsStyleList',
-    mixins:[JeecgListMixin, mixinDevice],
+  mixins: [JeecgListMixin, mixinDevice],
   components: {
     ZyClothsStyleModal
   },
-    data () {
+  data() {
     return {
       description: '服装款式表管理页面',
       // 表头
@@ -147,42 +155,42 @@
         {
           title: '#',
           dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+          key: 'rowIndex',
+          width: 60,
+          align: "center",
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1;
           }
         },
         {
-            title:'款式名称',
-            align:"center",
+          title: '款式名称',
+          align: "center",
           dataIndex: 'styleNames'
         },
         {
-            title:'编号',
-            align:"center",
+          title: '编号',
+          align: "center",
           dataIndex: 'nums'
         },
 
         {
-            title:'规格',
-            align:"center",
+          title: '规格',
+          align: "center",
           dataIndex: 'specification'
         },
         {
-            title:'服装类型',
-            align:"center",
+          title: '服装类型',
+          align: "center",
           dataIndex: 'typeId_dictText'
         },
         {
-            title:'形式',
-            align:"center",
+          title: '形式',
+          align: "center",
           dataIndex: 'shape_dictText'
         },
         {
-            title:'企业',
-            align:"center",
+          title: '企业',
+          align: "center",
           dataIndex: 'enterpriseId_dictText'
         },
         // {
@@ -196,25 +204,25 @@
         //   dataIndex: 'sewingForm_dictText'
         // },
         {
-            title:'创建时间',
-            align:"center",
+          title: '创建时间',
+          align: "center",
           dataIndex: 'createTime'
         },
         {
           title: '管理模块',
           dataIndex: 'action1',
-            align:"center",
-            fixed:"right",
-            width:110,
-            scopedSlots: { customRender: 'action1' }
+          align: "center",
+          fixed: "right",
+          width: 110,
+          scopedSlots: {customRender: 'action1'}
         },
         {
           title: '操作',
           dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: {customRender: 'action'}
         }
       ],
       url: {
@@ -225,20 +233,21 @@
         importExcelUrl: "zyclothsstyle/zyClothsStyle/importExcel",
 
       },
-        dictOptions:{},
-        superFieldList:[],
+      styleId: '',
+      dictOptions: {},
+      superFieldList: [],
     }
   },
   created() {
     this.getSuperFieldList();
   },
   computed: {
-      importExcelUrl: function(){
+    importExcelUrl: function () {
       return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
     },
   },
   methods: {
-      initDictConfig(){
+    initDictConfig() {
     },
     //管理模块
     jumpPage1(record) {
@@ -279,37 +288,43 @@
     //管理工序
     jumpPage5(record) {
       this.$router.push({
-          path: '/process/ZyProcessList',
+        //path: '/process/ZyProcessList',
+        path: '/zystylemodular/ZyStyleModularList',
         query: {  // 路由携带参数
-            'styleId': record.id,
+          'id': record.id,
         }
       });
     },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'popup',value:'typeId',text:'类型id', popup:{code:'zy_cloths_type',field:'type_name',orgFields:'type_name',destFields:'id'}})
-        fieldList.push({type:'string',value:'shape',text:'形式',dictCode:''})
-        fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
-        fieldList.push({type:'string',value:'styleNames',text:'名称',dictCode:''})
-        fieldList.push({type:'string',value:'specification',text:'规格',dictCode:''})
-        fieldList.push({type:'string',value:'salesTerritory',text:'销售地区',dictCode:''})
-        fieldList.push({type:'string',value:'productOverview',text:'产品概述',dictCode:''})
-        fieldList.push({type:'string',value:'structure',text:'结构',dictCode:''})
-        fieldList.push({type:'string',value:'characteristic',text:'特征',dictCode:''})
-        fieldList.push({type:'string',value:'designSketch',text:'效果',dictCode:''})
-        fieldList.push({type:'string',value:'mainMap',text:'主图',dictCode:''})
-        fieldList.push({type:'string',value:'measuringMethod',text:'测量方法',dictCode:''})
-        fieldList.push({type:'string',value:'error',text:'误差',dictCode:''})
-        fieldList.push({type:'string',value:'quotaMaterials',text:'定额用料',dictCode:''})
-        fieldList.push({type:'string',value:'foldingPackaging',text:'折叠搭配及包装',dictCode:''})
-        fieldList.push({type:'string',value:'accLogos',text:'配件及标志',dictCode:''})
-        fieldList.push({type:'string',value:'sewingForm',text:'缝纫形式',dictCode:''})
-        fieldList.push({type:'sel_depart',value:'enterpriseId',text:'企业id'})
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({
+        type: 'popup',
+        value: 'typeId',
+        text: '类型id',
+        popup: {code: 'zy_cloths_type', field: 'type_name', orgFields: 'type_name', destFields: 'id'}
+      })
+      fieldList.push({type: 'string', value: 'shape', text: '形式', dictCode: ''})
+      fieldList.push({type: 'string', value: 'nums', text: '编号', dictCode: ''})
+      fieldList.push({type: 'string', value: 'styleNames', text: '名称', dictCode: ''})
+      fieldList.push({type: 'string', value: 'specification', text: '规格', dictCode: ''})
+      fieldList.push({type: 'string', value: 'salesTerritory', text: '销售地区', dictCode: ''})
+      fieldList.push({type: 'string', value: 'productOverview', text: '产品概述', dictCode: ''})
+      fieldList.push({type: 'string', value: 'structure', text: '结构', dictCode: ''})
+      fieldList.push({type: 'string', value: 'characteristic', text: '特征', dictCode: ''})
+      fieldList.push({type: 'string', value: 'designSketch', text: '效果', dictCode: ''})
+      fieldList.push({type: 'string', value: 'mainMap', text: '主图', dictCode: ''})
+      fieldList.push({type: 'string', value: 'measuringMethod', text: '测量方法', dictCode: ''})
+      fieldList.push({type: 'string', value: 'error', text: '误差', dictCode: ''})
+      fieldList.push({type: 'string', value: 'quotaMaterials', text: '定额用料', dictCode: ''})
+      fieldList.push({type: 'string', value: 'foldingPackaging', text: '折叠搭配及包装', dictCode: ''})
+      fieldList.push({type: 'string', value: 'accLogos', text: '配件及标志', dictCode: ''})
+      fieldList.push({type: 'string', value: 'sewingForm', text: '缝纫形式', dictCode: ''})
+      fieldList.push({type: 'sel_depart', value: 'enterpriseId', text: '企业id'})
       this.superFieldList = fieldList
     }
   }
-  }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 </style>

ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularForm.vue

@@ -5,12 +5,16 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="款式id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">
-              <a-input v-model="model.styleId" placeholder="请输入款式id"  ></a-input>
+<!--              <a-input v-model="model.styleId" placeholder="请输入款式id"  ></a-input>-->
+              <j-dict-select-tag v-model="model.styleId"  placeholder="请选择款式"
+                                 dict-code="zy_cloths_style,style_names,id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="工序id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
-              <a-input v-model="model.processId" placeholder="请输入工序id"  ></a-input>
+<!--              <a-input v-model="model.processId" placeholder="请输入工序id"  ></a-input>-->
+              <j-dict-select-tag v-model="model.processId"  placeholder="请选择款式"
+                                 dict-code="zy_process,process_name,id" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -39,6 +43,7 @@
     data () {
       return {
         model:{
+          styleId:'',
          },
         labelCol: {
           xs: { span: 24 },
@@ -68,8 +73,9 @@
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
-      add () {
+      add1 (id) {
         this.edit(this.modelDefault);
+        this.model.styleId = id;
       },
       edit (record) {
         this.model = Object.assign({}, record);

ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal__Style#Drawer.vue

@@ -33,10 +33,10 @@
       }
     },
     methods: {
-      add () {
+      add1 (id) {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add();
+          this.$refs.realForm.add1(id);
         })
       },
       edit (record) {

jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java

@@ -37,9 +37,14 @@ public class ZyAccessories implements Serializable {
     private java.lang.String id;
 	/**类型id*/
 	@Excel(name = "类型id", width = 15)
+    @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id")
     @ApiModelProperty(value = "类型id")
     @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id")
     private java.lang.String typeId;
+
+    @ApiModelProperty(value = "类型")
+    private java.lang.String typeName;
+
 	/**编号*/
 	@Excel(name = "编号", width = 15)
     @ApiModelProperty(value = "编号")

jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java

@@ -70,6 +70,11 @@ public class ZyFabric implements Serializable {
     @Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "id")
     @ApiModelProperty(value = "类型")
     private java.lang.String typeId;
+
+    /**面料类型名称*/
+    @ApiModelProperty(value = "类型")
+    private java.lang.String typeName;
+
     /**图片地址*/
     @ApiModelProperty(value = "图片地址")
     private java.lang.String pictureUrl;

jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java

@@ -57,11 +57,11 @@ public class ZyStyleModular implements Serializable {
 	/**款式id*/
 	@Excel(name = "款式id", width = 15)
     @ApiModelProperty(value = "款式id")
-    @Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id")
+    @Dict(dictTable = "zy_cloths_style",dicText = "style_names",dicCode = "id")
     private String styleId;
 	/**工序id*/
 	@Excel(name = "工序id", width = 15)
     @ApiModelProperty(value = "工序id")
-    @Dict(dictTable = "zy_process", dicText = "process_name", dicCode = "id")
+    @Dict(dictTable = "zy_process",dicText = "process_name",dicCode = "id")
     private String processId;
 }