From 8c9558884a09ed640d0b2428500ddb81cec1fe24 Mon Sep 17 00:00:00 2001
From: wangjiadong <q1w2e3a4s5d6>
Date: Wed, 14 Dec 2022 17:01:45 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=95=86=E5=93=81?=
 =?UTF-8?q?=EF=BC=88=E8=A1=A3=E6=A9=B1=EF=BC=89=E9=A1=BE=E5=AE=A2=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomercollectgoodsController.java       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/controller/CustomercollectgoodsController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/controller/CustomercollectgoodsController.java
index 74b04c18..1811e872 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/controller/CustomercollectgoodsController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/controller/CustomercollectgoodsController.java
@@ -9,8 +9,11 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.customercollectgoods.entity.Customercollectgoods;
 import org.jeecg.modules.demo.customercollectgoods.service.ICustomercollectgoodsService;
@@ -71,6 +74,35 @@ public class CustomercollectgoodsController extends JeecgController<Customercoll
 		IPage<Customercollectgoods> pageList = customercollectgoodsService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
+
+
+
+	 /**
+	  * 分页列表查询
+	  *
+	  * @param customercollectgoods
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "收藏商品（衣橱）-分页列表查询")
+	 @ApiOperation(value="收藏商品（衣橱）-分页列表查询", notes="收藏商品（衣橱）-分页列表查询")
+	 @GetMapping(value = "/listcustom")
+	 public Result<?> listcustom(Customercollectgoods customercollectgoods,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+		 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+		 QueryWrapper<Customercollectgoods> queryWrapper = QueryGenerator.initQueryWrapper(customercollectgoods, req.getParameterMap());
+		 queryWrapper.eq("createBy",sysUser.getUsername());
+		 Page<Customercollectgoods> page = new Page<Customercollectgoods>(pageNo, pageSize);
+		 IPage<Customercollectgoods> pageList = customercollectgoodsService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+
+
 	
 	/**
 	 *   添加

From 36c2bf82f99fa67ecce3821a5b10b29c6a065dae Mon Sep 17 00:00:00 2001
From: wangjiadong <q1w2e3a4s5d6>
Date: Wed, 14 Dec 2022 17:02:40 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=95=86=E5=93=81?=
 =?UTF-8?q?=EF=BC=88=E8=A1=A3=E6=A9=B1=EF=BC=89=E9=A1=BE=E5=AE=A2=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/CustomercollectgoodsList.vue       | 196 ++++++++++++++++++
 .../modules/CustomercollectgoodsForm.vue      | 124 +++++++++++
 .../modules/CustomercollectgoodsModal.vue     |  60 ++++++
 ...ustomercollectgoodsModal__Style#Drawer.vue |  84 ++++++++
 4 files changed, 464 insertions(+)
 create mode 100644 ant-design-vue-jeecg/src/views/customercollectgoods/custom/CustomercollectgoodsList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsForm.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsModal__Style#Drawer.vue

diff --git a/ant-design-vue-jeecg/src/views/customercollectgoods/custom/CustomercollectgoodsList.vue b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/CustomercollectgoodsList.vue
new file mode 100644
index 00000000..711380cd
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/CustomercollectgoodsList.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-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('收藏商品（衣橱）')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <customercollectgoods-modal ref="modalForm" @ok="modalFormOk"></customercollectgoods-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CustomercollectgoodsModal from './modules/CustomercollectgoodsModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CustomercollectgoodsList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CustomercollectgoodsModal
+    },
+    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: 'userId_dictText'
+          },
+          {
+            title:'商品',
+            align:"center",
+            dataIndex: 'goodsId_dictText'
+          },
+          {
+            title:'当前单价',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'number'
+          },
+          {
+            title:'收藏夹',
+            align:"center",
+            dataIndex: 'collectTypeId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/customercollectgoods/customercollectgoods/listcustom",
+          delete: "/customercollectgoods/customercollectgoods/delete",
+          deleteBatch: "/customercollectgoods/customercollectgoods/deleteBatch",
+          exportXlsUrl: "/customercollectgoods/customercollectgoods/exportXls",
+          importExcelUrl: "customercollectgoods/customercollectgoods/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_user',value:'userId',text:'用户'})
+        fieldList.push({type:'sel_search',value:'goodsId',text:'商品',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'price',text:'当前单价',dictCode:''})
+        fieldList.push({type:'string',value:'number',text:'数量',dictCode:''})
+        fieldList.push({type:'sel_search',value:'collectTypeId',text:'收藏夹',dictTable:'collect_type', dictText:'collect_type_name', dictCode:'id'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsForm.vue b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsForm.vue
new file mode 100644
index 00000000..ecec87c9
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsForm.vue
@@ -0,0 +1,124 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <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="userId">
+              <j-select-user-by-dep v-model="model.userId" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
+              <j-search-select-tag v-model="model.goodsId" dict=""  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="当前单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input v-model="model.price" placeholder="请输入当前单价"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
+              <a-input v-model="model.number" placeholder="请输入数量"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收藏夹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectTypeId">
+              <j-search-select-tag v-model="model.collectTypeId" dict="collect_type,collect_type_name,id"  />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CustomercollectgoodsForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/customercollectgoods/customercollectgoods/add",
+          edit: "/customercollectgoods/customercollectgoods/edit",
+          queryById: "/customercollectgoods/customercollectgoods/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsModal.vue b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsModal.vue
new file mode 100644
index 00000000..bd182c76
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <customercollectgoods-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customercollectgoods-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CustomercollectgoodsForm from './CustomercollectgoodsForm'
+  export default {
+    name: 'CustomercollectgoodsModal',
+    components: {
+      CustomercollectgoodsForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      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/customercollectgoods/custom/modules/CustomercollectgoodsModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsModal__Style#Drawer.vue
new file mode 100644
index 00000000..c04821b9
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <customercollectgoods-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></customercollectgoods-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CustomercollectgoodsForm from './CustomercollectgoodsForm'
+
+  export default {
+    name: 'CustomercollectgoodsModal',
+    components: {
+      CustomercollectgoodsForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file

From 6939e4999ce04406a1f5deab8eda478e02b76878 Mon Sep 17 00:00:00 2001
From: wangjiadong <q1w2e3a4s5d6>
Date: Wed, 14 Dec 2022 17:14:54 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=95=86=E5=93=81?=
 =?UTF-8?q?=EF=BC=88=E8=A1=A3=E6=A9=B1=EF=BC=89bug=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/CustomercollectgoodsList.vue        | 22 ++++++++++++++++++-
 .../modules/CustomercollectgoodsForm.vue      |  2 +-
 .../custom/CustomercollectgoodsList.vue       | 22 ++++++++++++++++++-
 .../modules/CustomercollectgoodsForm.vue      |  2 +-
 .../entity/Customercollectgoods.java          |  5 +++--
 5 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/customercollectgoods/admin/CustomercollectgoodsList.vue b/ant-design-vue-jeecg/src/views/customercollectgoods/admin/CustomercollectgoodsList.vue
index f33e5853..e965d891 100644
--- a/ant-design-vue-jeecg/src/views/customercollectgoods/admin/CustomercollectgoodsList.vue
+++ b/ant-design-vue-jeecg/src/views/customercollectgoods/admin/CustomercollectgoodsList.vue
@@ -1,9 +1,29 @@
 <template>
   <a-card :bordered="false">
     <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
+<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-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="商品">
+              <j-search-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dict="zy_goods,goods_name,id"/>
+            </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>
diff --git a/ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue b/ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue
index ecec87c9..b3a8b801 100644
--- a/ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue
+++ b/ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue
@@ -10,7 +10,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
-              <j-search-select-tag v-model="model.goodsId" dict=""  />
+              <j-search-select-tag v-model="model.goodsId" dict="zy_goods,goods_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/ant-design-vue-jeecg/src/views/customercollectgoods/custom/CustomercollectgoodsList.vue b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/CustomercollectgoodsList.vue
index 711380cd..a4ea88d5 100644
--- a/ant-design-vue-jeecg/src/views/customercollectgoods/custom/CustomercollectgoodsList.vue
+++ b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/CustomercollectgoodsList.vue
@@ -1,9 +1,29 @@
 <template>
   <a-card :bordered="false">
     <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
+<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-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="商品">
+              <j-search-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dict="zy_goods,goods_name,id"/>
+            </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>
diff --git a/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsForm.vue b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsForm.vue
index ecec87c9..b3a8b801 100644
--- a/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsForm.vue
+++ b/ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsForm.vue
@@ -10,7 +10,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
-              <j-search-select-tag v-model="model.goodsId" dict=""  />
+              <j-search-select-tag v-model="model.goodsId" dict="zy_goods,goods_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/entity/Customercollectgoods.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/entity/Customercollectgoods.java
index f2c5e8f9..0f11c6b5 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/entity/Customercollectgoods.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/entity/Customercollectgoods.java
@@ -59,8 +59,9 @@ public class Customercollectgoods implements Serializable {
 	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
     @ApiModelProperty(value = "用户")
     private java.lang.String userId;
-	/**商品*/
-	@Excel(name = "商品", width = 15)
+    /**商品*/
+    @Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_name", dicCode = "id")
+    @Dict(dictTable = "zy_goods", dicText = "goods_name", dicCode = "id")
     @ApiModelProperty(value = "商品")
     private java.lang.String goodsId;
 	/**当前单价*/

From 6fb9df8a63396328891d407c85c063a23976800a Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Tue, 20 Dec 2022 15:37:31 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=8F=AD=E7=BB=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=2012.20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/productplan/ZyPlanProcessList.vue   |   6 +-
 .../views/productplan/ZyPlanTeamDataList.vue  | 331 ++++++++++++++++++
 .../src/views/productplan/ZyPlanTeamList.vue  | 257 ++++++++++++++
 .../controller/ZyPlanProcessController.java   |  75 +++-
 .../productplan/entity/ZyPlanProcess.java     |   2 +-
 .../productplan/entity/vo/ProcessDataVo.java  |   5 +
 .../service/IZyPlanProcessService.java        |   2 +
 .../impl/ZyPlanProcessServiceImpl.java        |  41 +++
 8 files changed, 708 insertions(+), 11 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamList.vue

diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
index 02a75a6b..d5812940 100644
--- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
@@ -104,7 +104,7 @@
             <a>删除</a>
           </a-popconfirm>
           <a-divider type="vertical"/>
-          <a @click="jumpPage1(record)">制定计划详情</a>
+          <a @click="jumpPage1(record)">制定计划工序</a>
         </span>
 
       </a-table>
@@ -187,8 +187,8 @@ export default {
         }
       ],
       url: {
-        // list: "/org.jeecg.modules.productplan/zyPlanProcess/list",
-        list: "/org.jeecg.modules.productplan/zyPlanProcess/list2",
+        list: "/org.jeecg.modules.productplan/zyPlanProcess/list",
+        // list: "/org.jeecg.modules.productplan/zyPlanProcess/list2",
         productPlanlist: "/org.jeecg.modules.productplan/zyProductPlan/list",
         delete: "/org.jeecg.modules.productplan/zyPlanProcess/delete",
         deleteBatch: "/org.jeecg.modules.productplan/zyPlanProcess/deleteBatch",
diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue
new file mode 100644
index 00000000..530bb524
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue
@@ -0,0 +1,331 @@
+<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">
+      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <!--      <a-button @click="zyStyleFabricHandleAdd(stationId)" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('1')">导出</a-button>
+      <a-button type="primary" @click="fanHui()">返回</a-button>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+      <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a-->
+      <!--        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+      <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+      <!--      </div>-->
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+        <!--        <span slot="machineIds_dictText" slot-scope="text, record">-->
+        <span slot="groupMemberList" slot-scope="record,text">
+          <a-select mode="multiple"
+                    @select="selectData($event,text)"
+                    style="width: 220px"
+                    placeholder="请选择">
+            <a-select-option v-for="item in record" :value="item.id">
+              {{ item.userId }}
+            </a-select-option>
+          </a-select>
+        </span>
+
+        <!--        <span slot="toolsList" slot-scope="toolsList">-->
+        <!--          <a-select style="width: 180px" placeholder="请选择">-->
+        <!--            <a-select-option v-for="item in toolsList" :value="item.id">-->
+        <!--              {{ item.name }}-->
+        <!--            </a-select-option>-->
+        <!--          </a-select>-->
+        <!--        </span>-->
+
+        <!--        <span slot="machineList" slot-scope="machineList">-->
+        <!--          <a-select style="width: 180px" placeholder="请选择">-->
+        <!--            <a-select-option v-for="item in machineList" :value="item.id">-->
+        <!--              {{ item.name }}-->
+        <!--            </a-select-option>-->
+        <!--          </a-select>-->
+        <!--        </span>-->
+      </a-table>
+    </div>
+
+    <div class="table-operator" style="text-align: right">
+      <a-button type="primary" @click="saveBatch">提交</a-button>
+    </div>
+
+    <!--    <zy-plan-process-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-plan-process-modal>-->
+  </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import ZyPlanProcessModal from './modules/ZyPlanProcessModal2'
+import {getAction, httpAction, downFile, postAction} from "@api/manage";
+import {filterObj} from "@/utils/util";
+
+export default {
+  name: 'ZyPlanProcessList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    ZyPlanProcessModal
+  },
+  data() {
+    return {
+      description: '生产计划班组管理页面',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: "center",
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1;
+          }
+        },
+        // {
+        //   title: '计划id',
+        //   align: "center",
+        //   dataIndex: 'planId'
+        // },
+        {
+          title: '工单编号',
+          align: "center",
+          dataIndex: 'workOrderId'
+        },
+        {
+          title: '产品id',
+          align: "center",
+          dataIndex: 'productId'
+        },
+        {
+          title: '产品',
+          align: "center",
+          dataIndex: 'productName'
+        },
+        {
+          title: '车间',
+          align: "center",
+          dataIndex: 'departName'
+        },
+        {
+          title: '工序',
+          align: "center",
+          dataIndex: 'processName'
+        },
+        {
+          title: '班组成员',
+          align: "center",
+          dataIndex: 'groupMemberList',
+          width: 150,
+          scopedSlots: {customRender: 'groupMemberList'}
+        },
+        // {
+        //   title: '工位工具列表',
+        //   align: "center",
+        //   dataIndex: 'toolsList',
+        //   width: 150,
+        //   scopedSlots: {customRender: 'toolsList'}
+        //   // scopedSlots: {customRender: this.toolsList}
+        // },
+        // {
+        //   title: '工具设备列表',
+        //   align: "center",
+        //   dataIndex: 'machineList',
+        //   width: 150,
+        //   scopedSlots: {customRender: 'machineList'}
+        // },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      url: {
+        list: "/org.jeecg.modules.productplan/zyPlanProcess/getTeamDatalist",
+        // getTeamDatalistByPlanId: "/org.jeecg.modules.productplan/zyPlanProcess/getTeamDatalistByPlanId",
+        groupMemberlist: "/groupxMember/list",
+        addTeamBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addTeamBatch",
+        // stationMachinelist: "/stationMachine/list",
+        // productPlanlist: "/org.jeecg.modules.productplan/zyProductPlan/list",
+        delete: "/org.jeecg.modules.productplan/zyPlanProcess/delete",
+        // deleteBatch: "/org.jeecg.modules.productplan/zyPlanProcess/deleteBatch",
+        // exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanProcess/exportXls",
+        // importExcelUrl: "org.jeecg.modules.productplan/zyPlanProcess/importExcel",
+      },
+      loadRouteType: false,
+      planId: "",
+      dictOptions: {},
+      superFieldList: [],
+      toolsList: [],
+      machineList: [],
+      processIds: [],
+      memberIds: [],
+    }
+  },
+  created() {
+    this.getSuperFieldList();
+    // this.model = Object.assign({}, record);
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    saveBatch() {
+      alert("保存开始")
+      postAction(this.url.addTeamBatch, this.processIds).then((res) => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$emit('ok')
+          this.close()
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.confirmLoading = false
+      })
+    },
+    fanHui() {
+      this.$router.push({
+        path: '/productplan/ZyPlanTeamList',
+      });
+    },
+    //$event为当前所选的key
+    selectData($event, row) {
+      console.log("group_member key $event=" + $event);
+      // console.log("group_member key row=" + JSON.stringify(row));
+      console.log("productProcessId=" + JSON.stringify(row.productProcessId));
+      this.processIds.push({"processId": row.productProcessId, "userIds": $event});
+
+      // for (var i = 0; i < processIds.length; i++) {
+        console.log("the processIds length:" + this.processIds.length);
+    },
+    //加载传递参数
+    loadParameter() {
+      if (this.loadRouteType === false) {
+        this.planId = this.$route.query.planId;
+        // this.biaoTi = this.$route.query.styleNames+"款式面料管理";
+        console.log("*******传递的planId:" + this.planId)
+        this.loadRouteType = true;
+      }
+    },
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      this.loadParameter();
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      console.log("----------------the params:", params);
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records || res.result;
+          if (res.result.total) {
+            this.ipagination.total = res.result.total;
+          } else {
+            this.ipagination.total = 0;
+          }
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        // this.dataSource.forEach(item => {
+        //   item['stationName'] = this.stationName;
+        //   item['stationNum'] = this.stationNum;
+        // })
+        this.loading = false
+      })
+    },
+    getQueryParams() {
+      //获取查询条件
+      let sqp = {}
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
+      }
+      var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      param.planId = this.planId;
+      return filterObj(param);
+    },
+    // initDictConfig() {
+    // },
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''})
+      fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''})
+      fieldList.push({type: 'string', value: 'processIds', text: '工序id列表', dictCode: ''})
+      fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''})
+      this.superFieldList = fieldList
+    },
+    // jumpPage1(record) {
+    //   this.$router.push({
+    //     // path: '/productplan/ZyProductPlanList',
+    //     path: '/productplan/ZyPlanProcessDataList',
+    //
+    //     // query: {  // 路由携带参数
+    //     //   'stationId': record.id,
+    //     //   'stationName': record.stationName,
+    //     // },
+    //   });
+    // },
+    // pf(record) {
+    //   this.$router.push({
+    //     path: '/productplan/ZyPlanProcessAddList',
+    //     query: {  // 路由携带参数
+    //     }
+    //   });
+
+    // getAction("productPlanlist", {id: record.id}).then((res) => {
+    //   if (res.success) {
+    //     this.$router.push({
+    //       path: '/src/views/processassessment/assessmentCourse/ClassOpeningTaskList',
+    //       query: {  // 路由携带参数
+    //       }
+    //     });
+    //   } else {
+    //     this.$message.error(res.message)
+    //   }
+    // });
+    // },
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamList.vue
new file mode 100644
index 00000000..414e22b2
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamList.vue
@@ -0,0 +1,257 @@
+<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">
+      <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>-->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal"
+                     @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <span slot="processId_dictText" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            <p>{{ text }}</p>
+          </template>
+          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a>
+        </a-popover>
+        </span>
+        <span slot="stationId_dictText" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            <p>{{ text }}</p>
+          </template>
+          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a>
+        </a-popover>
+        </span>
+
+        <span slot="toolsIds_dictText" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            <p>{{ text }}</p>
+          </template>
+          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a>
+        </a-popover>
+        </span>
+
+        <span slot="machineIds_dictText" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            <p>{{ text }}</p>
+          </template>
+          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a>
+        </a-popover>
+        </span>
+
+        <span slot="userIds" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            <p>{{ text }}</p>
+          </template>
+          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a>
+        </a-popover>
+        </span>
+
+        <span slot="action" slot-scope="text, record">
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+          <a-divider type="vertical"/>
+          <a @click="jumpPage1(record)">制定计划班组</a>
+        </span>
+
+      </a-table>
+    </div>
+
+    <zy-plan-process-modal ref="modalForm" @ok="modalFormOk"></zy-plan-process-modal>
+  </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import ZyPlanProcessModal from './modules/ZyPlanProcessModal2'
+
+export default {
+  name: 'ZyPlanProcessList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    ZyPlanProcessModal
+  },
+  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: 'planId'
+        },
+        {
+          title: '工序',
+          align: "center",
+          dataIndex: 'processId_dictText',
+          scopedSlots: {customRender: 'stationId_dictText'}
+        },
+        {
+          title: '工位',
+          align: "center",
+          dataIndex: 'stationId_dictText',
+          scopedSlots: {customRender: 'stationId_dictText'}
+        },
+        {
+          title: '设备',
+          align: "center",
+          dataIndex: 'machineIds_dictText',
+          scopedSlots: {customRender: 'machineIds_dictText'}
+        },
+        {
+          title: '工具',
+          align: "center",
+          dataIndex: 'toolsIds_dictText',
+          scopedSlots: {customRender: 'toolsIds_dictText'}
+        },
+        {
+          title: '成员',
+          align: "center",
+          dataIndex: 'userIds_dictText',
+          scopedSlots: {customRender: 'userIds_dictText'}
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      url: {
+        list: "/org.jeecg.modules.productplan/zyPlanProcess/list",
+        // list: "/org.jeecg.modules.productplan/zyPlanProcess/list2",
+        productPlanlist: "/org.jeecg.modules.productplan/zyProductPlan/list",
+        delete: "/org.jeecg.modules.productplan/zyPlanProcess/delete",
+        deleteBatch: "/org.jeecg.modules.productplan/zyPlanProcess/deleteBatch",
+        exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanProcess/exportXls",
+        importExcelUrl: "org.jeecg.modules.productplan/zyPlanProcess/importExcel",
+
+      },
+      dictOptions: {},
+      superFieldList: [],
+    }
+  },
+  created() {
+    this.getSuperFieldList();
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    initDictConfig() {
+    },
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''})
+      fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''})
+      fieldList.push({type: 'string', value: 'processIds', text: '工序id列表', dictCode: ''})
+      fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''})
+      this.superFieldList = fieldList
+    },
+    jumpPage1(record) {
+      this.$router.push({
+        path: '/productplan/ZyPlanTeamDataList',
+        query: {  // 路由携带参数
+          'planId': record.planId,
+          // 'stationName': record.stationName,
+        },
+      });
+    },
+    // pf(record) {
+    //   this.$router.push({
+    //     path: '/productplan/ZyPlanProcessAddList',
+    //     query: {  // 路由携带参数
+    //     }
+    //   });
+
+    // getAction("productPlanlist", {id: record.id}).then((res) => {
+    //   if (res.success) {
+    //     this.$router.push({
+    //       path: '/src/views/processassessment/assessmentCourse/ClassOpeningTaskList',
+    //       query: {  // 路由携带参数
+    //       }
+    //     });
+    //   } else {
+    //     this.$message.error(res.message)
+    //   }
+    // });
+    // },
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
index b26835f3..89a695e8 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
@@ -1,7 +1,10 @@
 package org.jeecg.modules.productplan.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.PageList;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,11 +13,14 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.productplan.entity.ZyPlanProcess;
 import org.jeecg.modules.productplan.entity.vo.ProcessDataVo;
 import org.jeecg.modules.productplan.service.IZyPlanProcessService;
+import org.jeecg.modules.team.entity.GroupxMember;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
@@ -22,9 +28,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description: 生产计划工序
@@ -111,6 +115,33 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP
         return Result.OK(processDatalist);
     }
 
+    @ApiOperation(value = "计划班组管理-查询产品工序&班组", notes = "计划班组管理-查询产品工序&班组")
+    @GetMapping(value = "/getTeamDatalist")
+    public Result<?> getTeamDatalist(ZyPlanProcess zyPlanProcess,
+                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                     HttpServletRequest req) {
+        QueryWrapper<ZyPlanProcess> queryWrapper = QueryGenerator.initQueryWrapper(zyPlanProcess, req.getParameterMap());
+//        Page<ZyPlanProcess> page = new Page<ZyPlanProcess>(pageNo, pageSize);
+        List<ProcessDataVo> processDatalist = zyPlanProcessService.getTeamDatalist(zyPlanProcess);
+//        PageList<ProcessDataVo> processDataVos = new PageList<>(processDatalist, processDatalist.size());
+
+        return Result.OK(processDatalist);
+    }
+
+    @ApiOperation(value = "计划班组管理-查询产品工序&班组", notes = "计划班组管理-查询产品工序&班组")
+    @GetMapping(value = "/getTeamDatalistByPlanId")
+    public Result<?> getTeamDatalistByPlanId(ZyPlanProcess zyPlanProcess,
+                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                             HttpServletRequest req) {
+        QueryWrapper<ZyPlanProcess> queryWrapper = QueryGenerator.initQueryWrapper(zyPlanProcess, req.getParameterMap());
+        queryWrapper.eq("plan_id", zyPlanProcess.getPlanId());
+        Page<ZyPlanProcess> page = new Page<ZyPlanProcess>(pageNo, pageSize);
+        IPage<ZyPlanProcess> pageList = zyPlanProcessService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
     /**
      * 添加
      *
@@ -125,6 +156,29 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP
         return Result.OK("添加成功！");
     }
 
+    //    @AutoLog(value = "生产计划工序-添加")
+    @ApiOperation(value = "计划工序管理-批量添加工序、工位、设备", notes = "计划工序管理-批量添加工序、工位、设备")
+    @PostMapping(value = "/addProcessBatch")
+    public Result<?> addProcessBatch(@RequestBody List<ZyPlanProcess> zyPlanProcessList) {
+
+        zyPlanProcessService.saveBatch(zyPlanProcessList);
+        return Result.OK("添加成功！");
+    }
+
+    //    @AutoLog(value = "计划班组管理-批量添加成员")
+    @ApiOperation(value = "计划班组管理-批量添zyPlanProcessList = {ArrayList@21228}  size = 7加工序-班组成员", notes = "批量添加工序-班组成员")
+    @PostMapping(value = "/addTeamBatch")
+    public Result<?> addTeamBatch(@RequestBody List<ZyPlanProcess> zyPlanProcessList) {
+        if (!ObjectUtils.isEmpty(zyPlanProcessList)) {
+            zyPlanProcessList.forEach(e -> {
+                zyPlanProcessService.update(new LambdaUpdateWrapper<ZyPlanProcess>()
+                        .set(ZyPlanProcess::getUserIds, e.getUserIds())
+                        .eq(ZyPlanProcess::getProcessId, e.getProcessId()));
+            });
+        }
+        return Result.OK("添加成功！");
+    }
+
     /**
      * 编辑
      *
@@ -145,7 +199,6 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP
      * @param id
      * @return
      */
-    @AutoLog(value = "生产计划工序-通过id删除")
     @ApiOperation(value = "生产计划工序-通过id删除", notes = "生产计划工序-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
@@ -159,11 +212,19 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP
      * @param ids
      * @return
      */
-    @AutoLog(value = "生产计划工序-批量删除")
-    @ApiOperation(value = "生产计划工序-批量删除", notes = "生产计划工序-批量删除")
+    @ApiOperation(value = "计划班组管理-批量删除工序-班组成员", notes = "计划班组管理-批量删除工序-班组成员")
     @DeleteMapping(value = "/deleteBatch")
     public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.zyPlanProcessService.removeByIds(Arrays.asList(ids.split(",")));
+        List<ZyPlanProcess> zyPlanProcessList = zyPlanProcessService.list(new LambdaQueryWrapper<ZyPlanProcess>().in(ZyPlanProcess::getId, Arrays.asList(ids.split(","))));
+        if (ObjectUtils.isEmpty(zyPlanProcessList)) throw new JeecgBootException("计划工序数据异常");
+        List<ZyPlanProcess> updateList = new LinkedList<>();
+        zyPlanProcessList.forEach(e -> {
+            ZyPlanProcess en = new ZyPlanProcess();
+            BeanUtils.copyProperties(e, en);
+            en.setUserIds("");
+            updateList.add(en);
+        });
+        zyPlanProcessService.updateBatchById(updateList);
         return Result.OK("批量删除成功!");
     }
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
index ae3b5c27..b286ca1d 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
@@ -100,6 +100,6 @@ public class ZyPlanProcess implements Serializable {
      */
     @Excel(name = "成员id列表", width = 15)
     @ApiModelProperty(value = "成员id列表")
-//    @Dict(dictTable = "sys_user", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "groupx_member", dicText = "user_id", dicCode = "id")
     private String userIds;
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java
index 596a69f1..84475544 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java
@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.team.entity.GroupxMember;
 import org.jeecg.modules.team.entity.Station;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ public class ProcessDataVo implements Serializable {
 
     private static final long serialVersionUID = 1009888L;
 
+    private String id;
     //工单id
     private String workOrderId;
 
@@ -31,6 +33,9 @@ public class ProcessDataVo implements Serializable {
     //工位
     private List<Station> stationList;
 
+    //班组成员列表
+    private List<GroupxMember> groupMemberList;
+
     //产品工序id
 //    @Dict(dictTable ="zy_process",dicText = "process_name",dicCode = "id")
     private String productProcessId;
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
index 804cca26..7a20f520 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
@@ -16,4 +16,6 @@ import java.util.List;
 public interface IZyPlanProcessService extends IService<ZyPlanProcess> {
 
     List<ProcessDataVo> getProcessDatalist(ZyPlanProcess zyPlanProcess);
+
+    List<ProcessDataVo> getTeamDatalist(ZyPlanProcess zyPlanProcess);
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
index ee9ddff8..d6a579da 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
@@ -16,7 +16,9 @@ import org.jeecg.modules.productplan.service.IZyPlanProcessService;
 import org.jeecg.modules.productplan.service.IZyProductPlanService;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.team.entity.GroupxMember;
 import org.jeecg.modules.team.entity.Station;
+import org.jeecg.modules.team.service.IGroupxMemberService;
 import org.jeecg.modules.team.service.IStationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +50,8 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
     private ISysDepartService iSysDepartService;
     @Autowired
     private IZyProcessService iZyProcessService;
+    @Autowired
+    private IGroupxMemberService iGroupxMemberService;
 
 
     public List<ProcessDataVo> getProcessDatalist(ZyPlanProcess zyPlanProcess) {
@@ -83,4 +87,41 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
         }
         return result;
     }
+
+    @Override
+    public List<ProcessDataVo> getTeamDatalist(ZyPlanProcess zyPlanProcess) {
+        //生产计划id
+        String planId = zyPlanProcess.getPlanId();
+        ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
+        if (ObjectUtils.isEmpty(zyPlanProcess)) {
+            throw new JeecgBootException("生产计划不存在!");
+        }
+        //工单id
+        String productCode = zyProductPlan.getProductCode();
+        String departId = zyProductPlan.getWorkshopId();
+        // TODO zy_product产品表，根据工单id获取产品id,
+        List<ProcessDataVo> result = new LinkedList<>();
+        //根据产品id获取产品工序列表
+//        List<ZyProductProcess> productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper<ZyProductProcess>().eq(ZyProductProcess::getProductId, "产品id"));
+        List<ZyProductProcess> productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper<ZyProductProcess>().eq(ZyProductProcess::getProductId, "1"));
+        if (!ObjectUtils.isEmpty(productProcessesList)) {
+            SysDepart depart = iSysDepartService.getById(departId);
+            List<GroupxMember> groupxMemberList = iGroupxMemberService.list(new LambdaQueryWrapper<GroupxMember>().eq(GroupxMember::getGroupxId, zyProductPlan.getTeamId()));
+            productProcessesList.forEach(e -> {
+                ProcessDataVo vo = new ProcessDataVo();
+//                vo.setId()
+                vo.setProductProcessId(e.getProcessId());
+                vo.setProcessName(iZyProcessService.getById(e.getProcessId()).getProcessName());
+                vo.setProductId(e.getProductId());
+//            vo.setProductName("产品名称")
+                vo.setWorkOrderId(productCode);
+                vo.setDepartId(departId);
+                vo.setDepartName(depart.getDepartName());
+//                vo.setStationList(stationList);
+                vo.setGroupMemberList(groupxMemberList);
+                result.add(vo);
+            });
+        }
+        return result;
+    }
 }

From c6b2fe429162d89cb9c18f79d7f158977359ceec Mon Sep 17 00:00:00 2001
From: wangjiadong <q1w2e3a4s5d6>
Date: Tue, 20 Dec 2022 16:45:07 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mall/user/ZyMallUserList.vue    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/mall/user/ZyMallUserList.vue b/ant-design-vue-jeecg/src/views/mall/user/ZyMallUserList.vue
index 67c533f2..66ed79e6 100644
--- a/ant-design-vue-jeecg/src/views/mall/user/ZyMallUserList.vue
+++ b/ant-design-vue-jeecg/src/views/mall/user/ZyMallUserList.vue
@@ -134,7 +134,7 @@
       </a-table>
     </div>
 
-    <a-tabs defaultActiveKey="1">
+    <!--<a-tabs defaultActiveKey="1">
       <a-tab-pane tab="地址表" key="1">
         <ZyMallAddressList :mainId="selectedMainId" />
       </a-tab-pane>
@@ -153,7 +153,7 @@
       <a-tab-pane tab="退货订单" key="6" forceRender>
         <ZyMallReturnOrderList :mainId="selectedMainId" />
       </a-tab-pane>
-    </a-tabs>
+    </a-tabs>-->
 
     <zyMallUser-modal ref="modalForm" @ok="modalFormOk"></zyMallUser-modal>
   </a-card>
@@ -190,36 +190,36 @@ export default {
       // 表头
       columns: [
         {
-          title: '账户',
+          title: '账户c',
           align: 'center',
-          dataIndex: 'account'
+          dataIndex: 'username'
         },
         {
           title: '昵称',
           align: 'center',
-          dataIndex: 'name'
+          dataIndex: 'realname'
         },
-        {
+       /* {
           title: '密码',
           align: 'center',
           dataIndex: 'password'
-        },
+        },*/
         {
           title: '电话',
           align: 'center',
           dataIndex: 'phone'
         },
-        {
+/*        {
           title: '状态',
           align: 'center',
           dataIndex: 'state_dictText'
-        },
+        },*/
         {
           title: '性别',
           align: 'center',
           dataIndex: 'sex_dictText'
         },
-        {
+      /*  {
           title: '个性签名',
           align: 'center',
           dataIndex: 'sign'
@@ -229,8 +229,8 @@ export default {
           align: 'center',
           dataIndex: 'picture',
           scopedSlots: { customRender: 'imgSlot' }
-        },
-        {
+        },*/
+       /* {
           title: '店铺id',
           align: 'center',
           dataIndex: 'shopId_dictText'
@@ -249,7 +249,7 @@ export default {
           title: '身份',
           align: 'center',
           dataIndex: 'userIdentity_dictText'
-        },
+        },*/
         {
           title: '生日',
           align: 'center',

From 8c4e1eff6eb97eb6238b429fa90c23630187b13e Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Tue, 20 Dec 2022 17:56:45 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=8F=AD=E7=BB=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=2012.20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productplan/ZyPlanFabricDataList.vue      | 226 ++++++++++++++++++
 .../views/productplan/ZyPlanFabricList.vue    | 198 +++++++++++++++
 .../views/productplan/ZyPlanProcessList.vue   |   4 +-
 .../productplan/modules/ZyPlanFabricForm.vue  | 126 ++++++++++
 .../productplan/modules/ZyPlanFabricForm2.vue | 106 ++++++++
 .../productplan/modules/ZyPlanFabricModal.vue |  70 ++++++
 .../modules/ZyPlanFabricModal2.vue            |  60 +++++
 .../ZyPlanFabricModal__Style#Drawer.vue       |  84 +++++++
 .../controller/ZyPlanFabricController.java    | 152 ++++++++++++
 .../productplan/entity/ZyPlanFabric.java      |  85 +++++++
 .../mapper/ZyPlanFabricMapper.java            |  14 ++
 .../service/IZyPlanFabricService.java         |  15 ++
 .../service/impl/ZyPlanFabricServiceImpl.java |  20 ++
 13 files changed, 1158 insertions(+), 2 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm.vue
 create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm2.vue
 create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricModal2.vue
 create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricModal__Style#Drawer.vue
 create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanFabricController.java
 create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java
 create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanFabricMapper.java
 create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanFabricService.java
 create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanFabricServiceImpl.java

diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue
new file mode 100644
index 00000000..0f262def
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue
@@ -0,0 +1,226 @@
+<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">
+      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button @click="zyStyleFabricHandleAdd(planId)" type="primary" icon="plus">新增</a-button>
+      <!--      <a-button @click="zyStyleFabricHandleAdd(stationId)" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('1')">导出</a-button>
+      <a-button type="primary" @click="fanHui()">返回</a-button>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+      <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a-->
+      <!--        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+      <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+      <!--      </div>-->
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+      <span slot="action" slot-scope="text, record">
+        <a @click="handleEdit(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>
+<!--          <a-divider type="vertical"/>-->
+<!--          <a @click="jumpPage1(record)">制定计划工序</a>-->
+        </span>
+      </a-table>
+    </div>
+
+    <!--    <div class="table-operator" style="text-align: right">-->
+    <!--      <a-button type="primary" @click="saveBatch">提交</a-button>-->
+    <!--    </div>-->
+    <zy-plan-fabric-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-plan-fabric-modal>
+    <!--    <zy-plan-process-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-plan-process-modal>-->
+  </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import ZyPlanFabricModal from './modules/ZyPlanFabricModal'
+import {getAction, httpAction, downFile, postAction} from "@api/manage";
+import {filterObj} from "@/utils/util";
+
+export default {
+  name: 'ZyPlanFabricDataList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    ZyPlanFabricModal
+  },
+  data() {
+    return {
+      description: '计划面料管理页面',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: "center",
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1;
+          }
+        },
+        // {
+        //   title: '计划id',
+        //   align: "center",
+        //   dataIndex: 'planId'
+        // },
+        {
+          title: '计划ID',
+          align: "center",
+          dataIndex: 'planId'
+        },
+        {
+          title: '面料',
+          align: "center",
+          dataIndex: 'fabricId_dictText'
+        },
+        {
+          title: '用量(厘米)',
+          align: "center",
+          dataIndex: 'amount'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      url: {
+        list: "/org.jeecg.modules.productplan/zyPlanFabric/list",
+        delete: "/org.jeecg.modules.productplan/zyPlanFabric/delete",
+        deleteBatch: "/org.jeecg.modules.productplan/zyPlanFabric/deleteBatch",
+        exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanFabric/exportXls",
+        importExcelUrl: "org.jeecg.modules.productplan/zyPlanFabric/importExcel",
+
+      },
+      loadRouteType: false,
+      planId: "",
+      dictOptions: {},
+      superFieldList: [],
+    }
+  },
+  created() {
+    this.getSuperFieldList();
+    // this.model = Object.assign({}, record);
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    fanHui() {
+      this.$router.push({
+        //这里的路径是要返回的对应菜单的路由配置地址
+        path: '/productplan/ZyplanFabricList',
+      });
+    },
+    valueChange(value) {
+      if (value) this.loadData()
+    },
+    //加载传递参数
+    loadParameter() {
+      if (this.loadRouteType === false) {
+        this.planId = this.$route.query.planId;
+        // this.biaoTi = this.$route.query.styleNames+"款式面料管理";
+        console.log("*******传递的planId:" + this.planId)
+        this.loadRouteType = true;
+      }
+    },
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      this.loadParameter();
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      console.log("----------------the params:", params);
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records || res.result;
+          if (res.result.total) {
+            this.ipagination.total = res.result.total;
+          } else {
+            this.ipagination.total = 0;
+          }
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        // this.dataSource.forEach(item => {
+        //   item['stationName'] = this.stationName;
+        //   item['stationNum'] = this.stationNum;
+        // })
+        this.loading = false
+      })
+    },
+    getQueryParams() {
+      //获取查询条件
+      let sqp = {}
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
+      }
+      var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      param.planId = this.planId;
+      return filterObj(param);
+    },
+    // initDictConfig() {
+    // },
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''})
+      fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''})
+      fieldList.push({type: 'string', value: 'processIds', text: '工序id列表', dictCode: ''})
+      fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''})
+      this.superFieldList = fieldList
+    },
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricList.vue
new file mode 100644
index 00000000..7e32c097
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricList.vue
@@ -0,0 +1,198 @@
+<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">
+      <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>-->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+<!--        <template slot="htmlSlot" slot-scope="text">-->
+<!--          <div v-html="text"></div>-->
+<!--        </template>-->
+<!--        <template slot="imgSlot" slot-scope="text">-->
+<!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>-->
+<!--          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
+<!--        </template>-->
+<!--        <template slot="fileSlot" slot-scope="text">-->
+<!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
+<!--          <a-button-->
+<!--            v-else-->
+<!--            :ghost="true"-->
+<!--            type="primary"-->
+<!--            icon="download"-->
+<!--            size="small"-->
+<!--            @click="downloadFile(text)">-->
+<!--            下载-->
+<!--          </a-button>-->
+<!--        </template>-->
+
+<!--        <span slot="action" slot-scope="text, record">-->
+<!--&lt;!&ndash;          <a @click="handleEdit(record)">编辑</a>&ndash;&gt;-->
+
+<!--          <a-divider type="vertical" />-->
+<!--          <a-dropdown>-->
+<!--&lt;!&ndash;            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>&ndash;&gt;-->
+<!--            <a-menu slot="overlay">-->
+<!--&lt;!&ndash;              <a-menu-item>&ndash;&gt;-->
+<!--&lt;!&ndash;                <a @click="handleDetail(record)">详情</a>&ndash;&gt;-->
+<!--&lt;!&ndash;              </a-menu-item>&ndash;&gt;-->
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </a-dropdown>-->
+<!--        </span>-->
+        <span slot="action" slot-scope="text, record">
+<!--          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--            <a>删除</a>-->
+<!--          </a-popconfirm>-->
+<!--          <a-divider type="vertical"/>-->
+          <a @click="jumpPage1(record)">制定计划面料</a>
+        </span>
+
+      </a-table>
+    </div>
+
+    <zy-plan-fabric-modal2 ref="modalForm" @ok="modalFormOk"></zy-plan-fabric-modal2>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ZyPlanFabricModal2 from './modules/ZyPlanFabricModal2'
+
+  export default {
+    name: 'ZyPlanFabricList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ZyPlanFabricModal2
+    },
+    data () {
+      return {
+        description: '计划面料表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'计划ID',
+            align:"center",
+            dataIndex: 'planId'
+          },
+          {
+            title:'面料',
+            align:"center",
+            dataIndex: 'fabricId_dictText'
+          },
+          {
+            title:'用量（合计）',
+            align:"center",
+            dataIndex: 'amount'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/org.jeecg.modules.productplan/zyPlanFabric/list",
+          delete: "/org.jeecg.modules.productplan/zyPlanFabric/delete",
+          deleteBatch: "/org.jeecg.modules.productplan/zyPlanFabric/deleteBatch",
+          exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanFabric/exportXls",
+          importExcelUrl: "org.jeecg.modules.productplan/zyPlanFabric/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      jumpPage1(record) {
+        this.$router.push({
+          path: '/productplan/ZyPlanFabricDataList',
+          query: {  // 路由携带参数
+            'planId': record.planId,
+            // 'stationName': record.stationName,
+          },
+        });
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'fabricId',text:'面料id',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'amount',text:'用量（合计）',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
index d5812940..ed51932f 100644
--- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
@@ -174,8 +174,8 @@ export default {
         {
           title: '成员',
           align: "center",
-          dataIndex: 'userIds',
-          scopedSlots: {customRender: 'userIds'}
+          dataIndex: 'userIds_dictText',
+          scopedSlots: {customRender: 'userIds_dictText'}
         },
         {
           title: '操作',
diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm.vue
new file mode 100644
index 00000000..beaa6e8b
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm.vue
@@ -0,0 +1,126 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <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="fabricId">
+<!--              <j-multi-select-tag type="checkbox" v-model="model.fabricId" dictCode="zy_fabric,name,id" placeholder="请选择面料" />-->
+              <j-dict-select-tag type="list" v-model="model.fabricId" dictCode="zy_fabric,name,id" placeholder="请选择面料"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用量(厘米)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amount">
+              <a-input-number v-model="model.amount" placeholder="请输入用量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ZyPlanFabricForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+          planId:''
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          fabricId: [
+            {required: true, message: "面料不能为空"},
+          ],
+          // status: [
+          //   {required: true,message: "状态不能为空"},
+          // ],
+          amount: [
+            {required: true, message: "用量不能不空"},
+            {pattern: /^[1-9]{0,1000}$/, message: '用量不能为空且长度为正整数'}
+          ],
+        },
+        url: {
+          add: "/org.jeecg.modules.productplan/zyPlanFabric/add",
+          edit: "/org.jeecg.modules.productplan/zyPlanFabric/edit",
+          queryById: "/org.jeecg.modules.productplan/zyPlanFabric/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add(planId) {
+        this.model.planId = planId;
+        console.log("Modal层接收到上级参数-planId:" + this.model.planId);
+        this.edit(this.model);
+      },
+      // add () {
+      //   this.edit(this.modelDefault);
+      // },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm2.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm2.vue
new file mode 100644
index 00000000..3932857c
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm2.vue
@@ -0,0 +1,106 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <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="planId">
+              <!--              <a-input v-model="model.planId" placeholder="请选择生产计划"></a-input>-->
+              <j-dict-select-tag type="list" v-model="model.planId" dictCode="zy_product_plan,id,id"
+                                 placeholder="请选择生产计划"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ZyPlanFabricForm2',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/org.jeecg.modules.productplan/zyPlanFabric/add",
+          edit: "/org.jeecg.modules.productplan/zyPlanFabric/edit",
+          queryById: "/org.jeecg.modules.productplan/zyPlanFabric/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricModal.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricModal.vue
new file mode 100644
index 00000000..48affde0
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricModal.vue
@@ -0,0 +1,70 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <zy-plan-fabric-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-plan-fabric-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ZyPlanFabricForm from './ZyPlanFabricForm'
+  export default {
+    name: 'ZyPlanFabricModal',
+    components: {
+      ZyPlanFabricForm
+    },
+    data () {
+      return {
+        model:{
+          planId:'',
+        },
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add (id) {
+        this.model.planId=id
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add(id);
+        })
+      },
+      // add () {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.add();
+      //   })
+      // },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      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/productplan/modules/ZyPlanFabricModal2.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricModal2.vue
new file mode 100644
index 00000000..df3f8031
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricModal2.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <zy-plan-fabric-form2 ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-plan-fabric-form2>
+  </j-modal>
+</template>
+
+<script>
+
+  import ZyPlanFabricForm2 from './ZyPlanFabricForm2'
+  export default {
+    name: 'ZyPlanFabricModal2',
+    components: {
+      ZyPlanFabricForm2
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      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/productplan/modules/ZyPlanFabricModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricModal__Style#Drawer.vue
new file mode 100644
index 00000000..6b6c6bd4
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <zy-plan-fabric-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zy-plan-fabric-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ZyPlanFabricForm from './ZyPlanFabricForm'
+
+  export default {
+    name: 'ZyPlanFabricModal',
+    components: {
+      ZyPlanFabricForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanFabricController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanFabricController.java
new file mode 100644
index 00000000..c7427804
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanFabricController.java
@@ -0,0 +1,152 @@
+package org.jeecg.modules.productplan.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.productplan.entity.ZyPlanFabric;
+import org.jeecg.modules.productplan.service.IZyPlanFabricService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 计划面料表
+ * @Author: jeecg-boot
+ * @Date: 2022-12-20
+ * @Version: V1.0
+ */
+@Api(tags = "计划面料表")
+@RestController
+@RequestMapping("/org.jeecg.modules.productplan/zyPlanFabric")
+@Slf4j
+public class ZyPlanFabricController extends JeecgController<ZyPlanFabric, IZyPlanFabricService> {
+    @Autowired
+    private IZyPlanFabricService zyPlanFabricService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param zyPlanFabric
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "计划面料表-分页列表查询")
+    @ApiOperation(value = "计划面料表-分页列表查询", notes = "计划面料表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(ZyPlanFabric zyPlanFabric, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<ZyPlanFabric> queryWrapper = QueryGenerator.initQueryWrapper(zyPlanFabric, req.getParameterMap());
+        Page<ZyPlanFabric> page = new Page<ZyPlanFabric>(pageNo, pageSize);
+        IPage<ZyPlanFabric> pageList = zyPlanFabricService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param zyPlanFabric
+     * @return
+     */
+    @AutoLog(value = "计划面料表-添加")
+    @ApiOperation(value = "计划面料表-添加", notes = "计划面料表-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody ZyPlanFabric zyPlanFabric) {
+        zyPlanFabricService.save(zyPlanFabric);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param zyPlanFabric
+     * @return
+     */
+    @AutoLog(value = "计划面料表-编辑")
+    @ApiOperation(value = "计划面料表-编辑", notes = "计划面料表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody ZyPlanFabric zyPlanFabric) {
+        zyPlanFabricService.updateById(zyPlanFabric);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "计划面料表-通过id删除")
+    @ApiOperation(value = "计划面料表-通过id删除", notes = "计划面料表-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        zyPlanFabricService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "计划面料表-批量删除")
+    @ApiOperation(value = "计划面料表-批量删除", notes = "计划面料表-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.zyPlanFabricService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "计划面料表-通过id查询")
+    @ApiOperation(value = "计划面料表-通过id查询", notes = "计划面料表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+        ZyPlanFabric zyPlanFabric = zyPlanFabricService.getById(id);
+        if (zyPlanFabric == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(zyPlanFabric);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param zyPlanFabric
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ZyPlanFabric zyPlanFabric) {
+        return super.exportXls(request, zyPlanFabric, ZyPlanFabric.class, "计划面料表");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ZyPlanFabric.class);
+    }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java
new file mode 100644
index 00000000..cc008a9f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java
@@ -0,0 +1,85 @@
+package org.jeecg.modules.productplan.entity;
+
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 计划面料表
+ * @Author: jeecg-boot
+ * @Date: 2022-12-20
+ * @Version: V1.0
+ */
+@Data
+@TableName("zy_plan_fabric")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "zy_plan_fabric对象", description = "计划面料表")
+public class ZyPlanFabric implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 计划id
+     */
+    @Excel(name = "计划id", width = 15)
+    @ApiModelProperty(value = "计划id")
+    private String planId;
+    /**
+     * 面料id
+     */
+    @Excel(name = "面料id", width = 15)
+    @ApiModelProperty(value = "面料id")
+    @Dict(dictTable = "zy_fabric", dicText = "name", dicCode = "id")
+    private String fabricId;
+    /**
+     * 用量（合计）
+     */
+    @Excel(name = "用量（合计）", width = 15)
+    @ApiModelProperty(value = "用量（合计）")
+    private BigDecimal amount;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanFabricMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanFabricMapper.java
new file mode 100644
index 00000000..ce6cda6f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanFabricMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.productplan.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.productplan.entity.ZyPlanFabric;
+
+/**
+ * @Description: 计划面料表
+ * @Author: jeecg-boot
+ * @Date: 2022-12-20
+ * @Version: V1.0
+ */
+public interface ZyPlanFabricMapper extends BaseMapper<ZyPlanFabric> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanFabricService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanFabricService.java
new file mode 100644
index 00000000..9fe7ec46
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanFabricService.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.productplan.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.productplan.entity.ZyPlanFabric;
+
+/**
+ * @Description: 计划面料表
+ * @Author: jeecg-boot
+ * @Date: 2022-12-20
+ * @Version: V1.0
+ */
+public interface IZyPlanFabricService extends IService<ZyPlanFabric> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanFabricServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanFabricServiceImpl.java
new file mode 100644
index 00000000..066d3c83
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanFabricServiceImpl.java
@@ -0,0 +1,20 @@
+package org.jeecg.modules.productplan.service.impl;
+
+
+import org.jeecg.modules.productplan.entity.ZyPlanFabric;
+import org.jeecg.modules.productplan.mapper.ZyPlanFabricMapper;
+import org.jeecg.modules.productplan.service.IZyPlanFabricService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 计划面料表
+ * @Author: jeecg-boot
+ * @Date:   2022-12-20
+ * @Version: V1.0
+ */
+@Service
+public class ZyPlanFabricServiceImpl extends ServiceImpl<ZyPlanFabricMapper, ZyPlanFabric> implements IZyPlanFabricService {
+
+}

From cd719eb31ee76fc4e28dee4f585eafd6cc674d03 Mon Sep 17 00:00:00 2001
From: wangjiadong <q1w2e3a4s5d6>
Date: Wed, 21 Dec 2022 10:12:00 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=B5=8B=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/CustomerMeasureList.vue             |   6 +-
 .../admin/modules/CustomerMeasureForm.vue     |  28 +--
 .../controller/CustomerMeasureController.java | 169 +++++++++++++-----
 .../entity/CustomerMeasure.java               |  11 +-
 .../mapper/CustomerMeasureMapper.java         |   5 +-
 .../mapper/xml/CustomerMeasureMapper.xml      |   2 +-
 .../service/ICustomerMeasureService.java      |   6 +-
 .../impl/CustomerMeasureServiceImpl.java      |   5 +-
 8 files changed, 168 insertions(+), 64 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue b/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue
index aaec7697..f56e0e59 100644
--- a/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue
+++ b/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="用户">
-              <j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
+              <j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -162,6 +162,7 @@
           {
             title:'排序',
             align:"center",
+            sorter: true,
             dataIndex: 'sort'
           },
           {
@@ -228,7 +229,8 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'sel_user',value:'userId',text:'用户'})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
+        fieldList.push({type:'popup',value:'username',text:'用户名', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}})
         fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
         fieldList.push({type:'double',value:'height',text:'身高（厘米）',dictCode:''})
         fieldList.push({type:'double',value:'weight',text:'体重（千克）',dictCode:''})
diff --git a/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue b/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue
index c5d86e26..58945a91 100644
--- a/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue
+++ b/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue
@@ -4,18 +4,26 @@
       <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="userId">
-              <j-select-user-by-dep v-model="model.userId" />
+            <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
+              <j-popup
+                v-model="model.username"
+                field="username"
+                org-fields="id,realname"
+                dest-fields="userId,username"
+                code="findcust"
+                :multi="true"
+                @input="popupCallback"
+                />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
-              <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
+              <a-input-number    v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="身高（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="height">
-              <a-input-number v-model="model.height" placeholder="请输入身高（厘米）" style="width: 100%" />
+              <a-input-number    v-model="model.height" placeholder="请输入身高（厘米）" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -70,12 +78,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="衣长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="length">
-              <a-input-number v-model="model.length" placeholder="请输入衣长" style="width: 100%" />
+              <a-input-number v-model="model.length" placeholder="请输入衣长（厘米）" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="胸距" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sternalDistance">
-              <a-input-number v-model="model.sternalDistance" placeholder="请输入胸距" style="width: 100%" />
+              <a-input-number v-model="model.sternalDistance" placeholder="请输入胸距（厘米）" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -98,11 +106,6 @@
               <j-select-user-by-dep v-model="model.measurerId" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="量体时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measurementTime">
-              <j-date placeholder="请选择量体时间"  v-model="model.measurementTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -194,6 +197,9 @@
          
         })
       },
+      popupCallback(value,row){
+         this.model = Object.assign(this.model, row);
+      },
     }
   }
 </script>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/controller/CustomerMeasureController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/controller/CustomerMeasureController.java
index 401ee8ae..619a9db9 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/controller/CustomerMeasureController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/controller/CustomerMeasureController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.demo.customermeasure.controller;
 
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -9,11 +10,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
 import org.jeecg.modules.demo.customermeasure.service.ICustomerMeasureService;
@@ -42,7 +40,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 顾客测体管理
  * @Author: jeecg-boot
- * @Date:   2022-12-03
+ * @Date:   2022-12-20
  * @Version: V1.0
  */
 @Api(tags="顾客测体管理")
@@ -52,7 +50,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class CustomerMeasureController extends JeecgController<CustomerMeasure, ICustomerMeasureService> {
 	@Autowired
 	private ICustomerMeasureService customerMeasureService;
-
+	
 	/**
 	 * 分页列表查询
 	 *
@@ -74,36 +72,8 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
 		IPage<CustomerMeasure> pageList = customerMeasureService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-
-
-
-	 /**
-	  * 分页列表查询
-	  *
-	  * @param customerMeasure
-	  * @param pageNo
-	  * @param pageSize
-	  * @param req
-	  * @return
-	  */
-	 @AutoLog(value = "顾客测体管理-分页列表查询")
-	 @ApiOperation(value="顾客测体管理-分页列表查询", notes="顾客测体管理-分页列表查询")
-	 @GetMapping(value = "/listcustom")
-	 public Result<?> listcustom(CustomerMeasure customerMeasure,
-									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									HttpServletRequest req) {
-		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		 QueryWrapper<CustomerMeasure> queryWrapper = QueryGenerator.initQueryWrapper(customerMeasure, req.getParameterMap());
-		 queryWrapper.eq("createBy",sysUser.getUsername());
-		 Page<CustomerMeasure> page = new Page<CustomerMeasure>(pageNo, pageSize);
-		 IPage<CustomerMeasure> pageList = customerMeasureService.page(page, queryWrapper);
-		 return Result.OK(pageList);
-	 }
-
-
-
-	 /**
+	
+	/**
 	 *   添加
 	 *
 	 * @param customerMeasure
@@ -113,10 +83,66 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
 	@ApiOperation(value="顾客测体管理-添加", notes="顾客测体管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody CustomerMeasure customerMeasure) {
-		customerMeasureService.save(customerMeasure);
-		return Result.OK("添加成功！");
+		int flag =0;
+		if (customerMeasure.getHeight()<0 ) {
+			flag =1;
+			return Result.error("身高请输入大于零的数字");
+		}
+		if (customerMeasure.getWeight()<0){
+			flag =1;
+			return Result.error("体重请输入大于零的数字");
+		}
+		if(customerMeasure.getHem()<0){
+			flag =1;
+			return Result.error("下摆请输入大于零的数字");
+		}
+		if(customerMeasure.getCuff()<0){
+			flag =1;
+			return Result.error("袖口请输入大于零的数字");
+		}
+		if(customerMeasure.getSleeveLength()<0){
+			flag =1;
+			return Result.error("袖长请输入大于零的数字");
+		}
+		if(customerMeasure.getBust()<0){
+			flag =1;
+			return Result.error("胸围请输入大于零的数字");
+		}
+		if(customerMeasure.getTheWaist()<0){
+			flag =1;
+			return Result.error("腰围请输入大于零的数字");
+		}
+		if(customerMeasure.getShoulderWidth()<0){
+			flag =1;
+			return Result.error("肩宽请输入大于零的数字");
+		}
+		if(customerMeasure.getForebodyLength()<0){
+			flag =1;
+			return Result.error("前身长请输入大于零的数字");
+		}
+		if(customerMeasure.getNeck()<0){
+			flag =1;
+			return Result.error("领围请输入大于零的数字");
+		}
+		if(customerMeasure.getHipline()<0){
+			flag =1;
+			return Result.error("臀围请输入大于零的数字");
+		}
+		if(customerMeasure.getLength()<0){
+			flag =1;
+			return Result.error("衣长请输入大于零的数字");
+		}
+		if(customerMeasure.getSternalDistance()<0){
+			flag =1;
+			return Result.error("胸距请输入大于零的数字");
+		}
+		if (flag==0){
+			customerMeasureService.save(customerMeasure);
+			return Result.OK("添加成功！");
+		}
+		return Result.OK("");
 	}
-
+	
 	/**
 	 *  编辑
 	 *
@@ -127,10 +153,67 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
 	@ApiOperation(value="顾客测体管理-编辑", notes="顾客测体管理-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody CustomerMeasure customerMeasure) {
-		customerMeasureService.updateById(customerMeasure);
-		return Result.OK("编辑成功!");
-	}
+		int flag =0;
+		if (customerMeasure.getHeight()<0 ) {
+			flag =1;
+			return Result.error("身高请输入大于零的数字");
+		}
+		if (customerMeasure.getWeight()<0){
+			flag =1;
+			return Result.error("体重请输入大于零的数字");
+		}
+		if(customerMeasure.getHem()<0){
+			flag =1;
+			return Result.error("下摆请输入大于零的数字");
+		}
+		if(customerMeasure.getCuff()<0){
+			flag =1;
+			return Result.error("袖口请输入大于零的数字");
+		}
+		if(customerMeasure.getSleeveLength()<0){
+			flag =1;
+			return Result.error("袖长请输入大于零的数字");
+		}
+		if(customerMeasure.getBust()<0){
+			flag =1;
+			return Result.error("胸围请输入大于零的数字");
+		}
+		if(customerMeasure.getTheWaist()<0){
+			flag =1;
+			return Result.error("腰围请输入大于零的数字");
+		}
+		if(customerMeasure.getShoulderWidth()<0){
+			flag =1;
+			return Result.error("肩宽请输入大于零的数字");
+		}
+		if(customerMeasure.getForebodyLength()<0){
+			flag =1;
+			return Result.error("前身长请输入大于零的数字");
+		}
+		if(customerMeasure.getNeck()<0){
+			flag =1;
+			return Result.error("领围请输入大于零的数字");
+		}
+		if(customerMeasure.getHipline()<0){
+			flag =1;
+			return Result.error("臀围请输入大于零的数字");
+		}
+		if(customerMeasure.getLength()<0){
+			flag =1;
+			return Result.error("衣长请输入大于零的数字");
+		}
+		if(customerMeasure.getSternalDistance()<0){
+			flag =1;
+			return Result.error("胸距请输入大于零的数字");
+		}
+		if (flag==0){
+			customerMeasureService.updateById(customerMeasure);
+			return Result.OK("编辑成功!");
+		}
 
+		return Result.OK("");
+	}
+	
 	/**
 	 *   通过id删除
 	 *
@@ -144,7 +227,7 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
 		customerMeasureService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-
+	
 	/**
 	 *  批量删除
 	 *
@@ -158,7 +241,7 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
 		this.customerMeasureService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-
+	
 	/**
 	 * 通过id查询
 	 *
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java
index 7e9125bb..0d5ce1ff 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.demo.customermeasure.entity;
 
+
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
@@ -20,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 顾客测体管理
  * @Author: jeecg-boot
- * @Date:   2022-12-03
+ * @Date:   2022-12-20
  * @Version: V1.0
  */
 @Data
@@ -55,10 +56,14 @@ public class CustomerMeasure implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
 	/**用户*/
-	@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
-	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+	@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
+	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
     @ApiModelProperty(value = "用户")
     private String userId;
+	/**用户名*/
+	@Excel(name = "用户名", width = 15)
+    @ApiModelProperty(value = "用户名")
+    private String username;
 	/**排序*/
 	@Excel(name = "排序", width = 15)
     @ApiModelProperty(value = "排序")
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/mapper/CustomerMeasureMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/mapper/CustomerMeasureMapper.java
index 58c80c2c..8ff16a67 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/mapper/CustomerMeasureMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/mapper/CustomerMeasureMapper.java
@@ -1,15 +1,18 @@
 package org.jeecg.modules.demo.customermeasure.mapper;
 
+
+
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
 
 /**
  * @Description: 顾客测体管理
  * @Author: jeecg-boot
- * @Date:   2022-12-03
+ * @Date:   2022-12-20
  * @Version: V1.0
  */
 public interface CustomerMeasureMapper extends BaseMapper<CustomerMeasure> {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/mapper/xml/CustomerMeasureMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/mapper/xml/CustomerMeasureMapper.xml
index 6932ede2..42d79bc6 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/mapper/xml/CustomerMeasureMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/mapper/xml/CustomerMeasureMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-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.customermeasure.mapper.CustomerMeasureMapper">
+<mapper namespace=".customermeasure.mapper.CustomerMeasureMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/ICustomerMeasureService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/ICustomerMeasureService.java
index 060333ab..8cd14d19 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/ICustomerMeasureService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/ICustomerMeasureService.java
@@ -1,12 +1,14 @@
 package org.jeecg.modules.demo.customermeasure.service;
 
-import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
+
+
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
 
 /**
  * @Description: 顾客测体管理
  * @Author: jeecg-boot
- * @Date:   2022-12-03
+ * @Date:   2022-12-20
  * @Version: V1.0
  */
 public interface ICustomerMeasureService extends IService<CustomerMeasure> {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/impl/CustomerMeasureServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/impl/CustomerMeasureServiceImpl.java
index 1949c77a..dbebfabd 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/impl/CustomerMeasureServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/impl/CustomerMeasureServiceImpl.java
@@ -1,5 +1,8 @@
 package org.jeecg.modules.demo.customermeasure.service.impl;
 
+
+
+
 import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
 import org.jeecg.modules.demo.customermeasure.mapper.CustomerMeasureMapper;
 import org.jeecg.modules.demo.customermeasure.service.ICustomerMeasureService;
@@ -10,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 顾客测体管理
  * @Author: jeecg-boot
- * @Date:   2022-12-03
+ * @Date:   2022-12-20
  * @Version: V1.0
  */
 @Service

From 37e290fb4425a3e2bfe641d39046619807be09d5 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Wed, 21 Dec 2022 10:44:32 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=2012.21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/productplan/ZyPlanFabricDataList.vue              | 2 +-
 .../src/views/productplan/modules/ZyPlanFabricForm.vue          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue
index 0f262def..1fd32872 100644
--- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue
@@ -12,7 +12,7 @@
       <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <a-button @click="zyStyleFabricHandleAdd(planId)" type="primary" icon="plus">新增</a-button>
       <!--      <a-button @click="zyStyleFabricHandleAdd(stationId)" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('1')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('计划面料')">导出</a-button>
       <a-button type="primary" @click="fanHui()">返回</a-button>
     </div>
 
diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm.vue
index beaa6e8b..eb95a77b 100644
--- a/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm.vue
+++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanFabricForm.vue
@@ -60,7 +60,7 @@
           // ],
           amount: [
             {required: true, message: "用量不能不空"},
-            {pattern: /^[1-9]{0,1000}$/, message: '用量不能为空且长度为正整数'}
+            {pattern: /^[0-9]{0,1000}$/, message: '用量不能为空且长度为正整数'}
           ],
         },
         url: {