2022-11-23 修改模块工序 部件工序

ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue

@@ -67,6 +67,10 @@
           </a-button>
         </template>
 
+        <span slot="action2" slot-scope="text, record"  >
+          <a @click="viewVid2(record)" >查看</a>
+        </span>
+
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
@@ -95,6 +99,7 @@
     </div>
 
     <zy-cloths-component-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-component-modal>
+    <ZyProcessComponentList ref="ZyProcessComponentList"></ZyProcessComponentList>
   </a-card>
 </template>
 
@@ -104,12 +109,15 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ZyClothsComponentModal from './modules/ZyClothsComponentModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import ZyProcessComponentList from "@views/process/ZyProcessComponentList"
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil';
+
 
   export default {
     name: 'ZyClothsComponentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
+      ZyProcessComponentList,
       ZyClothsComponentModal
     },
     data () {
@@ -174,7 +182,12 @@
             align:"center",
             dataIndex: 'createTime'
           },
-
+          {
+            title: '部件工序',
+            dataIndex: 'action2',
+            align:"center",
+            scopedSlots: { customRender: 'action2' }
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -205,6 +218,11 @@
       },
     },
     methods: {
+      viewVid2(record){
+        this.$refs.ZyProcessComponentList.showModal2();
+        this.$refs.ZyProcessComponentList.edit2(record);
+        this.$refs.ZyProcessComponentList.disableSubmit = false;
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue

@@ -79,6 +79,9 @@
         <span slot="action2" slot-scope="text, record">
             <a @click="viewVid(record)">查看</a>
         </span>
+        <span slot="action3" slot-scope="text, record">
+            <a @click="viewVid2(record)">查看</a>
+        </span>
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
@@ -111,6 +114,7 @@
     <zy-cloths-modular-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-modular-modal>
 <!--    <ZyClothsMcList ref="ZyClothsMcList"></ZyClothsMcList>-->
     <ZyClothsModularCompentList ref="ZyClothsModularCompentList"></ZyClothsModularCompentList>
+    <ZyProcessModularList ref="ZyProcessModularList"></ZyProcessModularList>
   </a-card>
 </template>
 
@@ -122,11 +126,13 @@ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import ZyClothsModularModal from './modules/ZyClothsModularModal'
 import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 import ZyClothsModularCompentList from "@views/process/ZyClothsModularCompentList";
+import ZyProcessModularList from "@views/zyProcessModular/ZyProcessModularList";
 
 export default {
   name: 'ZyClothsModularList',
   mixins: [JeecgListMixin, mixinDevice],
   components: {
+    ZyProcessModularList,
     ZyClothsModularCompentList,
     ZyClothsModularModal
   },
@@ -194,6 +200,13 @@ export default {
           // fixed:"right",
           scopedSlots: { customRender: 'action2' }
         },
+        {
+          title: '模块工序',
+          dataIndex: 'action3',
+          align:"center",
+          // fixed:"right",
+          scopedSlots: { customRender: 'action3' }
+        },
         {
           title: '操作',
           dataIndex: 'action',
@@ -230,6 +243,12 @@ export default {
       console.log("zyclothsMclist"+record.id);
       this.$refs.ZyClothsModularCompentList.disableSubmit = false;
     },
+    viewVid2(record){
+      this.$refs.ZyProcessModularList.showModal1();
+      this.$refs.ZyProcessModularList.edit1(record);
+      console.log("父弹窗ID++++++："+record.id);
+      this.$refs.ZyProcessModularList.disableSubmit = false;
+    },
     initDictConfig() {
     },
     getSuperFieldList() {

ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue

@@ -1,5 +1,13 @@
 <template>
-  <a-card :bordered="false">
+<!--  <a-card :bordered="false">-->
+  <a-modal
+    width="70%"
+    title="评分项管理"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -11,7 +19,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleAdd1(componentId1)" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('zy_process_component')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
@@ -91,7 +99,7 @@
 
     <zy-process-component-modal ref="modalForm" @ok="modalFormOk"></zy-process-component-modal>
     <ZyProcessComponentFormDetail ref="ZyProcessComponentFormDetail"></ZyProcessComponentFormDetail>
-  </a-card>
+  </a-modal>
 </template>
 
 <script>
@@ -107,11 +115,15 @@
     name: 'ZyProcessComponentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      ZyProcessComponentModal,ZyProcessComponentFormDetail
+      ZyProcessComponentModal,
+      ZyProcessComponentFormDetail
     },
     data () {
       return {
         description: 'zy_process_component管理页面',
+        visible: false,
+        confirmLoading: false,
+        componentId1:'',
         // 表头
         columns: [
           {
@@ -139,6 +151,11 @@
             align:"center",
             dataIndex: 'bottleneck_dictText'
           },
+          {
+            title:'创建时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -169,6 +186,30 @@
       },
     },
     methods: {
+      edit2(record) {
+        this.model = Object.assign({}, record);
+        this.componentId1 = this.model.id;
+        //console.log(topicid);
+        this.queryParam.componentId = this.model.id;
+        //console.log( this.queryParam.topicid);
+        this.loadData();
+        this.visible = true;
+      },
+      showModal2() {
+        this.visible = true;
+      },
+      handleOk(e) {
+        this.ModalText = 'The modal will be closed after two seconds';
+        this.confirmLoading = true;
+        setTimeout(() => {
+          this.visible = false;
+          this.confirmLoading = false;
+        }, 2000);
+      },
+      handleCancel(e) {
+        console.log('Clicked cancel button');
+        this.visible = false;
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

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

@@ -44,6 +44,7 @@
     data () {
       return {
         model:{
+          componentId: '',
          },
         labelCol: {
           xs: { span: 24 },
@@ -82,8 +83,9 @@
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
-      add () {
+      add1 (componentId1) {
         this.edit(this.modelDefault);
+        this.model.componentId = componentId1;
       },
       edit (record) {
         this.model = Object.assign({}, record);

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

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

ant-design-vue-jeecg/src/views/zyProcessModular/ZyProcessModularList.vue

@@ -0,0 +1,218 @@
+<template>
+<!--  <a-card :bordered="false">-->
+  <a-modal
+    width="70%"
+    title="模块工序管理"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <!-- 查询区域 -->
+    <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="handleAdd1(modularId1)" 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,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" 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>
+
+    <zy-process-modular-modal ref="modalForm" @ok="modalFormOk"></zy-process-modular-modal>
+  </a-modal>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import ZyProcessModularModal from './modules/ZyProcessModularModal'
+
+export default {
+  name: 'ZyProcessModularList',
+  mixins:[JeecgListMixin, mixinDevice],
+  components: {
+    ZyProcessModularModal
+  },
+  data () {
+    return {
+      description: '模块工序表管理页面',
+      visible: false,
+      confirmLoading: false,
+      modularId1: '',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key:'rowIndex',
+          width:60,
+          align:"center",
+          customRender:function (t,r,index) {
+            return parseInt(index)+1;
+          }
+        },
+        {
+          title:'模块ID',
+          align:"center",
+          dataIndex: 'modularId_dictText'
+        },
+        {
+          title:'工序ID',
+          align:"center",
+          dataIndex: 'processId'
+        },
+        {
+          title:'创建时间',
+          align:"center",
+          dataIndex: 'createTime'
+        },
+
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align:"center",
+          fixed:"right",
+          width:147,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      url: {
+        list: "/zyProcessModular/zyProcessModular/list",
+        delete: "/zyProcessModular/zyProcessModular/delete",
+        deleteBatch: "/zyProcessModular/zyProcessModular/deleteBatch",
+        exportXlsUrl: "/zyProcessModular/zyProcessModular/exportXls",
+        importExcelUrl: "zyProcessModular/zyProcessModular/importExcel",
+
+      },
+      dictOptions:{},
+      superFieldList:[],
+    }
+  },
+  created() {
+    this.getSuperFieldList();
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    edit1(record) {
+      this.model = Object.assign({}, record);
+      this.modularId1= this.model.id;
+      //console.log(topicid);
+      this.queryParam.modularId = this.model.id;
+      console.log("子弹窗拿到的ID++++++："+ this.queryParam.modularId);
+      this.loadData();
+      this.visible = true;
+    },
+    showModal1() {
+      this.visible = true;
+    },
+    handleOk(e) {
+      this.ModalText = 'The modal will be closed after two seconds';
+      this.confirmLoading = true;
+      setTimeout(() => {
+        this.visible = false;
+        this.confirmLoading = false;
+      }, 2000);
+    },
+    handleCancel(e) {
+      console.log('Clicked cancel button');
+      this.visible = false;
+    },
+    initDictConfig(){
+    },
+    getSuperFieldList(){
+      let fieldList=[];
+      fieldList.push({type:'string',value:'modularId',text:'模块ID',dictCode:''})
+      fieldList.push({type:'string',value:'processId',text:'工序ID',dictCode:''})
+      this.superFieldList = fieldList
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>

ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularForm.vue

@@ -0,0 +1,118 @@
+<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="模块ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">-->
+<!--              <a-input v-model="model.modularId" placeholder="请输入模块ID"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-model-item label="模块名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">
+              <j-dict-select-tag type="list" v-model="model.modularId"
+                                 dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块名称" disabled/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工序ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
+              <a-input v-model="model.processId" placeholder="请输入工序ID"  ></a-input>
+            </a-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: 'ZyProcessModularForm',
+  components: {
+  },
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false
+    }
+  },
+  data () {
+    return {
+      model:{
+        modularId: '',
+      },
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      validatorRules: {
+      },
+      url: {
+        add: "/zyProcessModular/zyProcessModular/add",
+        edit: "/zyProcessModular/zyProcessModular/edit",
+        queryById: "/zyProcessModular/zyProcessModular/queryById"
+      }
+    }
+  },
+  computed: {
+    formDisabled(){
+      return this.disabled
+    },
+  },
+  created () {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    add1 (modularId1) {
+      this.edit(this.modelDefault);
+      this.model.modularId = modularId1;
+
+    },
+    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>

ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <zy-process-modular-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zy-process-modular-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 ZyProcessModularForm from './ZyProcessModularForm'
+
+export default {
+  name: 'ZyProcessModularModal',
+  components: {
+    ZyProcessModularForm
+  },
+  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>

ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularModal.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-process-modular-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-modular-form>
+  </j-modal>
+</template>
+
+<script>
+
+import ZyProcessModularForm from './ZyProcessModularForm'
+export default {
+  name: 'ZyProcessModularModal',
+  components: {
+    ZyProcessModularForm
+  },
+  data () {
+    return {
+      title:'',
+      width:800,
+      visible: false,
+      disableSubmit: false
+    }
+  },
+  methods: {
+    add1 (modularId1) {
+      this.visible=true
+      this.$nextTick(()=>{
+        this.$refs.realForm.add1(modularId1);
+      })
+    },
+    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>

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java

@@ -50,8 +50,8 @@ public class ZyProcessComponent implements Serializable {
     @ApiModelProperty(value = "是否瓶颈工序")
     private String bottleneck;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/controller/ZyProcessModularController.java

@@ -0,0 +1,161 @@
+package org.jeecg.modules.zyProcessModular.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.zyProcessModular.entity.ZyProcessModular;
+import org.jeecg.modules.zyProcessModular.service.IZyProcessModularService;
+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-11-22
+ * @Version: V1.0
+ */
+@Api(tags="模块工序表")
+@RestController
+@RequestMapping("/zyProcessModular/zyProcessModular")
+@Slf4j
+public class ZyProcessModularController extends JeecgController<ZyProcessModular, IZyProcessModularService> {
+    @Autowired
+    private IZyProcessModularService zyProcessModularService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param zyProcessModular
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "模块工序表-分页列表查询")
+    @ApiOperation(value="模块工序表-分页列表查询", notes="模块工序表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ZyProcessModular>> queryPageList(ZyProcessModular zyProcessModular,
+                                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        QueryWrapper<ZyProcessModular> queryWrapper = QueryGenerator.initQueryWrapper(zyProcessModular, req.getParameterMap());
+        Page<ZyProcessModular> page = new Page<ZyProcessModular>(pageNo, pageSize);
+        IPage<ZyProcessModular> pageList = zyProcessModularService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     *   添加
+     *
+     * @param zyProcessModular
+     * @return
+     */
+    @AutoLog(value = "模块工序表-添加")
+    @ApiOperation(value="模块工序表-添加", notes="模块工序表-添加")
+    //@RequiresPermissions("org.jeecg.modules.demo:zy_process_modular:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody ZyProcessModular zyProcessModular) {
+        zyProcessModularService.save(zyProcessModular);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     *  编辑
+     *
+     * @param zyProcessModular
+     * @return
+     */
+    @AutoLog(value = "模块工序表-编辑")
+    @ApiOperation(value="模块工序表-编辑", notes="模块工序表-编辑")
+    //@RequiresPermissions("org.jeecg.modules.demo:zy_process_modular:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+    public Result<String> edit(@RequestBody ZyProcessModular zyProcessModular) {
+        zyProcessModularService.updateById(zyProcessModular);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     *   通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "模块工序表-通过id删除")
+    @ApiOperation(value="模块工序表-通过id删除", notes="模块工序表-通过id删除")
+    //@RequiresPermissions("org.jeecg.modules.demo:zy_process_modular:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+        zyProcessModularService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     *  批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "模块工序表-批量删除")
+    @ApiOperation(value="模块工序表-批量删除", notes="模块工序表-批量删除")
+    //@RequiresPermissions("org.jeecg.modules.demo:zy_process_modular:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+        this.zyProcessModularService.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) {
+        ZyProcessModular zyProcessModular = zyProcessModularService.getById(id);
+        if(zyProcessModular==null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(zyProcessModular);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param zyProcessModular
+     */
+    //@RequiresPermissions("org.jeecg.modules.demo:zy_process_modular:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ZyProcessModular zyProcessModular) {
+        return super.exportXls(request, zyProcessModular, ZyProcessModular.class, "模块工序表");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    //@RequiresPermissions("zy_process_modular:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ZyProcessModular.class);
+    }
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java

@@ -0,0 +1,64 @@
+package org.jeecg.modules.zyProcessModular.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 模块工序表
+ * @Author: jeecg-boot
+ * @Date:   2022-11-22
+ * @Version: V1.0
+ */
+@Data
+@TableName("zy_process_modular")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="zy_process_modular对象", description="模块工序表")
+public class ZyProcessModular implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**模块ID*/
+    @Excel(name = "模块ID", width = 15)
+    @ApiModelProperty(value = "模块ID")
+    @Dict(dictTable = "zy_cloths_modular",dicText = "modular_name",dicCode = "id")
+    private java.lang.String modularId;
+    /**工序ID*/
+    @Excel(name = "工序ID", width = 15)
+    @ApiModelProperty(value = "工序ID")
+    private java.lang.String processId;
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/mapper/ZyProcessModularMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.zyProcessModular.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.zyProcessModular.entity.ZyProcessModular;
+
+/**
+ * @Description: 模块工序表
+ * @Author: jeecg-boot
+ * @Date:   2022-11-22
+ * @Version: V1.0
+ */
+public interface ZyProcessModularMapper extends BaseMapper<ZyProcessModular> {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/mapper/xml/ZyProcessModularMapper.xml

@@ -0,0 +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.zyProcessModular.mapper.ZyProcessModularMapper">
+
+</mapper>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/service/IZyProcessModularService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.zyProcessModular.service;
+
+import org.jeecg.modules.zyProcessModular.entity.ZyProcessModular;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 模块工序表
+ * @Author: jeecg-boot
+ * @Date:   2022-11-22
+ * @Version: V1.0
+ */
+public interface IZyProcessModularService extends IService<ZyProcessModular> {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/service/impl/ZyProcessModularServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.zyProcessModular.service.impl;
+
+import org.jeecg.modules.zyProcessModular.entity.ZyProcessModular;
+import org.jeecg.modules.zyProcessModular.mapper.ZyProcessModularMapper;
+import org.jeecg.modules.zyProcessModular.service.IZyProcessModularService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 模块工序表
+ * @Author: jeecg-boot
+ * @Date:   2022-11-22
+ * @Version: V1.0
+ */
+@Service
+public class ZyProcessModularServiceImpl extends ServiceImpl<ZyProcessModularMapper, ZyProcessModular> implements IZyProcessModularService {
+
+}