From c7848c4e6867b9a6f9024a9e02dc266dfe3952ce Mon Sep 17 00:00:00 2001 From: YTD <1158283261@qq.com> Date: Mon, 14 Nov 2022 15:05:30 +0800 Subject: [PATCH 1/8] 2022-11-14 --- .../src/mixins/JeecgListMixin.js | 4 ++-- .../src/views/process/ZyProcessList.vue | 4 ++-- .../modules/ZyProcessAccessoriesList.vue | 18 +++++++++--------- .../process/modules/ZyProcessFabricList.vue | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js index 78ab45f2..89083d94 100644 --- a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js +++ b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js @@ -249,7 +249,7 @@ export const JeecgListMixin = { }, fuliao: function (id) { this.$refs.modalForm3.edit(id); - this.$refs.modalForm3.title = "工序辅料管理"; + this.$refs.modalForm3.title = "工序面料管理"; this.$refs.modalForm3.disableSubmit = false; }, gongju: function (id) { @@ -259,7 +259,7 @@ export const JeecgListMixin = { }, mianliao: function (id) { this.$refs.modalForm5.edit(id); - this.$refs.modalForm5.title = "工序面料管理"; + this.$refs.modalForm5.title = "工序辅料管理"; this.$refs.modalForm5.disableSubmit = false; }, handleAdd: function () { diff --git a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue index 550e970f..c8833255 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue @@ -98,11 +98,11 @@ 设备 - 辅料 + 面料 工具 - 面料 + 辅料 更多 diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue index ef19b0e4..0a1376c2 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue @@ -5,8 +5,8 @@ - - + + @@ -23,7 +23,7 @@
新增 - 导出 + 导出 @@ -124,7 +124,7 @@ xs: { span: 24 }, sm: { span: 16 }, }, - description: '面料表管理页面', + description: '辅料表管理页面', // 表头 columns: [ { @@ -148,12 +148,12 @@ dataIndex: 'processId_dictText' }, { - title:'面料编号', + title:'辅料编号', align:"center", dataIndex: 'accessoriesId' }, { - title:'面料', + title:'辅料', align:"center", dataIndex: 'accessoriesId_dictText' }, @@ -172,7 +172,7 @@ deleteBatch: "/pro/zyProcessAccessories/deleteBatch", exportXlsUrl: "/pro/zyProcessAccessories/exportXls", importExcelUrl: "pro/zyProcessAccessories/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -190,7 +190,7 @@ edit (record) { this.id = record; this.queryParam.processId=this.id; - console.log("燕慧森1号") + // console.log("燕慧森1号") this.loadData(); this.visible = true; @@ -200,7 +200,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'popup',value:'processId',text:'工序表id', popup:{code:'',field:'',orgFields:'',destFields:''}}) - fieldList.push({type:'popup',value:'accessoriesId',text:'面料表id', popup:{code:'',field:'',orgFields:'',destFields:''}}) + fieldList.push({type:'popup',value:'accessoriesId',text:'辅料表id', popup:{code:'',field:'',orgFields:'',destFields:''}}) this.superFieldList = fieldList } } diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue index 6467e719..37bd5e22 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue @@ -11,7 +11,7 @@ - + @@ -153,12 +153,12 @@ dataIndex: 'processId_dictText' }, { - title:'辅料编号', + title:'面料编号', align:"center", dataIndex: 'fabricId' }, { - title:'辅料', + title:'面料', align:"center", dataIndex: 'fabricId_dictText' }, @@ -195,7 +195,7 @@ edit (record) { this.id = record; this.queryParam.processId=this.id; - console.log("燕慧森1号") + // console.log("燕慧森1号") this.loadData(); this.visible = true; }, @@ -204,7 +204,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'processId',text:'工序',dictCode:'zy_process,process_name,id'}) - fieldList.push({type:'string',value:'fabricId',text:'辅料',dictCode:'zy_fabric,name,id'}) + fieldList.push({type:'string',value:'fabricId',text:'面料',dictCode:'zy_fabric,name,id'}) this.superFieldList = fieldList } } From 64a30d89f72093edc2e4cc90e83f9bae3fb4447a Mon Sep 17 00:00:00 2001 From: YTD <1158283261@qq.com> Date: Mon, 14 Nov 2022 15:32:22 +0800 Subject: [PATCH 2/8] =?UTF-8?q?2022-11-14=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/cloths/modules/ZyProcessAccessoriesForm.vue | 4 ++-- .../src/views/cloths/modules/ZyProcessFabricForm.vue | 2 +- .../src/views/process/modules/ZyProcessFabricList.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesForm.vue b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesForm.vue index 0641213c..804881f2 100644 --- a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesForm.vue +++ b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesForm.vue @@ -28,7 +28,7 @@ - + - + --> - + From dfa3819ee2150dfa2881959c4fb5beb38926f7bb Mon Sep 17 00:00:00 2001 From: YTD <1158283261@qq.com> Date: Mon, 14 Nov 2022 16:36:47 +0800 Subject: [PATCH 3/8] =?UTF-8?q?2022-11-14=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/cloths/ZyProcessAccessoriesList.vue | 10 +++++----- .../src/views/cloths/ZyProcessFabricList.vue | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/cloths/ZyProcessAccessoriesList.vue b/ant-design-vue-jeecg/src/views/cloths/ZyProcessAccessoriesList.vue index ad2569d4..5a520b2f 100644 --- a/ant-design-vue-jeecg/src/views/cloths/ZyProcessAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/cloths/ZyProcessAccessoriesList.vue @@ -10,8 +10,8 @@ - - + + @@ -129,7 +129,7 @@ xs: { span: 24 }, sm: { span: 16 }, }, - description: '面料表管理页面', + description: '辅料表管理页面', // 表头 columns: [ { @@ -153,12 +153,12 @@ dataIndex: 'processId_dictText' }, { - title:'面料编号', + title:'辅料编号', align:"center", dataIndex: 'accessoriesId' }, { - title:'面料', + title:'辅料', align:"center", dataIndex: 'accessoriesId_dictText' }, diff --git a/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue index 1aba9052..31d7d9ef 100644 --- a/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue +++ b/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue @@ -10,8 +10,8 @@ - - + + @@ -152,12 +152,12 @@ dataIndex: 'processId_dictText' }, { - title:'辅料编号', + title:'面料编号', align:"center", dataIndex: 'fabricId' }, { - title:'辅料', + title:'面料', align:"center", dataIndex: 'fabricId_dictText' }, From 619f07edd839ca8a11d24120a4812adf272ececc Mon Sep 17 00:00:00 2001 From: YTD <1158283261@qq.com> Date: Mon, 14 Nov 2022 16:44:50 +0800 Subject: [PATCH 4/8] =?UTF-8?q?2022-11-14=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/src/mixins/JeecgListMixin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js index 89083d94..68759ee3 100644 --- a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js +++ b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js @@ -232,7 +232,7 @@ export const JeecgListMixin = { this.$refs.modalForm.disableSubmit = false; }, fuzhi: function (record) { - record.id=null; + record.id=""; this.$refs.modalForm.edit(record); this.$refs.modalForm.title = "复制"; this.$refs.modalForm.disableSubmit = false; From c5bd277295c1821ec7006b4a790b0ef66cd8386d Mon Sep 17 00:00:00 2001 From: YTD <1158283261@qq.com> Date: Mon, 14 Nov 2022 17:04:00 +0800 Subject: [PATCH 5/8] =?UTF-8?q?2022-11-14=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZyProcessAccessoriesController.java | 22 +++++++++++++---- .../controller/ZyProcessActionController.java | 24 ++++++++++++++----- .../controller/ZyProcessFabricController.java | 12 ++++++++++ .../ZyProcessMachineController.java | 12 ++++++++++ .../controller/ZyOperationtoolController.java | 13 ++++++++++ 5 files changed, 72 insertions(+), 11 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java index 2f893026..4fccd6a8 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java @@ -98,7 +98,7 @@ public class ZyProcessAccessoriesController extends JeecgController pageList = zyProcessAccessoriesService.page1(page, s,t); return Result.OK(pageList); } - + /** * 添加 * @@ -109,10 +109,16 @@ public class ZyProcessAccessoriesController extends JeecgController add(@RequestBody ZyProcessAccessories zyProcessAccessories) { + QueryWrapper s=new QueryWrapper(); + s.eq("process_id",zyProcessAccessories.getProcessId()); + s.eq("accessories_id",zyProcessAccessories.getAccessoriesId()); + int a=zyProcessAccessoriesService.count(s); + if(a>=1) + return Result.error("已存在本信息"); zyProcessAccessoriesService.save(zyProcessAccessories); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -123,10 +129,16 @@ public class ZyProcessAccessoriesController extends JeecgController edit(@RequestBody ZyProcessAccessories zyProcessAccessories) { + QueryWrapper s=new QueryWrapper(); + s.eq("process_id",zyProcessAccessories.getProcessId()); + s.eq("accessories_id",zyProcessAccessories.getAccessoriesId()); + int a=zyProcessAccessoriesService.count(s); + if(a>=1) + return Result.error("已存在本信息"); zyProcessAccessoriesService.updateById(zyProcessAccessories); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -140,7 +152,7 @@ public class ZyProcessAccessoriesController extends JeecgController { @Autowired private IZyProcessActionService zyProcessActionService; - + /** * 分页列表查询 * @@ -97,7 +97,7 @@ public class ZyProcessActionController extends JeecgController add(@RequestBody ZyProcessAction zyProcessAction) { + QueryWrapper s=new QueryWrapper(); + s.eq("process_id",zyProcessAction.getProcessId()); + s.eq("action_id",zyProcessAction.getActionId()); + int a=zyProcessActionService.count(s); + if(a>=1) + return Result.error("已存在本信息"); zyProcessActionService.save(zyProcessAction); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -122,10 +128,16 @@ public class ZyProcessActionController extends JeecgController edit(@RequestBody ZyProcessAction zyProcessAction) { + QueryWrapper s=new QueryWrapper(); + s.eq("process_id",zyProcessAction.getProcessId()); + s.eq("action_id",zyProcessAction.getActionId()); + int a=zyProcessActionService.count(s); + if(a>=1) + return Result.error("已存在本信息"); zyProcessActionService.updateById(zyProcessAction); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -139,7 +151,7 @@ public class ZyProcessActionController extends JeecgController add(@RequestBody ZyProcessFabric zyProcessFabric) { + QueryWrapper s=new QueryWrapper(); + s.eq("process_id",zyProcessFabric.getProcessId()); + s.eq("fabric_id",zyProcessFabric.getFabricId()); + int a=zyProcessFabricService.count(s); + if(a>=1) + return Result.error("已存在本信息"); zyProcessFabricService.save(zyProcessFabric); return Result.OK("添加成功！"); } @@ -120,6 +126,12 @@ public class ZyProcessFabricController extends JeecgController edit(@RequestBody ZyProcessFabric zyProcessFabric) { + QueryWrapper s=new QueryWrapper(); + s.eq("process_id",zyProcessFabric.getProcessId()); + s.eq("fabric_id",zyProcessFabric.getFabricId()); + int a=zyProcessFabricService.count(s); + if(a>=1) + return Result.error("已存在本信息"); zyProcessFabricService.updateById(zyProcessFabric); return Result.OK("编辑成功!"); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java index 0cb60428..c7d7dafc 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java @@ -105,6 +105,12 @@ public class ZyProcessMachineController extends JeecgController add(@RequestBody ZyProcessMachine zyProcessMachine) { + QueryWrapper s=new QueryWrapper(); + s.eq("process_id",zyProcessMachine.getProcessId()); + s.eq("machine_id",zyProcessMachine.getMachineId()); + int a=zyProcessMachineService.count(s); + if(a>=1) + return Result.error("已存在本信息"); zyProcessMachineService.save(zyProcessMachine); return Result.OK("添加成功！"); } @@ -119,6 +125,12 @@ public class ZyProcessMachineController extends JeecgController edit(@RequestBody ZyProcessMachine zyProcessMachine) { + QueryWrapper s=new QueryWrapper(); + s.eq("process_id",zyProcessMachine.getProcessId()); + s.eq("machine_id",zyProcessMachine.getMachineId()); + int a=zyProcessMachineService.count(s); + if(a>=1) + return Result.error("已存在本信息"); zyProcessMachineService.updateById(zyProcessMachine); return Result.OK("编辑成功!"); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java index 4e2b5017..aa03ed31 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.operationtool.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; @@ -88,6 +89,12 @@ public class ZyOperationtoolController extends JeecgController add(@RequestBody ZyOperationtool zyOperationtool) { + QueryWrapper s=new QueryWrapper(); + s.eq("process_id",zyOperationtool.getOperationid()); + s.eq("toolid",zyOperationtool.getToolid()); + int a=zyOperationtoolService.count(s); + if(a>=1) + return Result.error("已存在本信息"); zyOperationtoolService.save(zyOperationtool); return Result.OK("添加成功！"); } @@ -102,6 +109,12 @@ public class ZyOperationtoolController extends JeecgController edit(@RequestBody ZyOperationtool zyOperationtool) { + QueryWrapper s=new QueryWrapper(); + s.eq("operationid",zyOperationtool.getOperationid()); + s.eq("toolid",zyOperationtool.getToolid()); + int a=zyOperationtoolService.count(s); + if(a>=1) + return Result.error("已存在本信息"); zyOperationtoolService.updateById(zyOperationtool); return Result.OK("编辑成功!"); } From 1f022d09cc45d1dd900dfecca61579cef3abb3e2 Mon Sep 17 00:00:00 2001 From: YTD <1158283261@qq.com> Date: Mon, 14 Nov 2022 17:22:22 +0800 Subject: [PATCH 6/8] 2022-11-14weitiao --- .../operationtool/controller/ZyOperationtoolController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java index aa03ed31..d76f7a37 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java @@ -90,7 +90,7 @@ public class ZyOperationtoolController extends JeecgController add(@RequestBody ZyOperationtool zyOperationtool) { QueryWrapper s=new QueryWrapper(); - s.eq("process_id",zyOperationtool.getOperationid()); + s.eq("operationid",zyOperationtool.getOperationid()); s.eq("toolid",zyOperationtool.getToolid()); int a=zyOperationtoolService.count(s); if(a>=1) From 9cb3f88e41973c903de0205040cb1f6655a17ec9 Mon Sep 17 00:00:00 2001 From: mors <3067699729@qq.com> Date: Mon, 14 Nov 2022 17:46:58 +0800 Subject: [PATCH 7/8] =?UTF-8?q?2022-11-14=20=E8=B5=B5=E7=8E=89=E7=91=9E=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E8=A1=A3=E6=A8=A1=E5=9D=97=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/src/main.js | 4 +- .../src/views/process/ZyClothsMcList.vue | 224 ++++++++++++++++ .../src/views/process/ZyClothsMccList.vue | 225 ++++++++++++++++ .../process/ZyClothsModularCompentList.vue | 246 ++++++++++-------- .../src/views/process/ZyClothsModularList.vue | 31 ++- .../views/process/modules/ZyClothsMcForm.vue | 118 +++++++++ .../views/process/modules/ZyClothsMcModal.vue | 66 +++++ .../modules/ZyClothsMcModal__Style#Drawer.vue | 84 ++++++ .../views/process/modules/ZyClothsMccForm.vue | 122 +++++++++ .../process/modules/ZyClothsMccModal.vue | 66 +++++ .../ZyClothsMccModal__Style#Drawer.vue | 84 ++++++ .../modules/ZyClothsModularCompentForm.vue | 14 +- .../process/modules/ZyClothsModularForm.vue | 10 +- .../base/controller/ZyClothsMcController.java | 155 +++++++++++ .../controller/ZyClothsMccController.java | 155 +++++++++++ .../modules/demo/base/entity/ZyClothsMc.java | 67 +++++ .../modules/demo/base/entity/ZyClothsMcc.java | 67 +++++ .../demo/base/mapper/ZyClothsMcMapper.java | 14 + .../demo/base/mapper/ZyClothsMccMapper.java | 14 + .../demo/base/mapper/xml/ZyClothsMcMapper.xml | 5 + .../base/mapper/xml/ZyClothsMccMapper.xml | 5 + .../demo/base/service/IZyClothsMcService.java | 14 + .../base/service/IZyClothsMccService.java | 16 ++ .../service/impl/ZyClothsMcServiceImpl.java | 18 ++ .../service/impl/ZyClothsMccServiceImpl.java | 19 ++ 25 files changed, 1717 insertions(+), 126 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue create mode 100644 ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcForm.vue create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal.vue create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal__Style#Drawer.vue create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccForm.vue create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal.vue create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal__Style#Drawer.vue create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMcController.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMccController.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMc.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMcc.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMcMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMccMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMcMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMccMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMcService.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMccService.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMcServiceImpl.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMccServiceImpl.java diff --git a/ant-design-vue-jeecg/src/main.js b/ant-design-vue-jeecg/src/main.js index 654afc7a..11ee55ba 100644 --- a/ant-design-vue-jeecg/src/main.js +++ b/ant-design-vue-jeecg/src/main.js @@ -12,8 +12,8 @@ import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; // YU-优化 -//require('@jeecg/antd-online-mini') -//require('@jeecg/antd-online-mini/dist/OnlineForm.css') +require('@jeecg/antd-online-mini') +require('@jeecg/antd-online-mini/dist/OnlineForm.css') import Antd, { version } from 'ant-design-vue' console.log('ant-design-vue version:', version) diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue new file mode 100644 index 00000000..2b0fc7e1 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue @@ -0,0 +1,224 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue new file mode 100644 index 00000000..2ecb136e --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue @@ -0,0 +1,225 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue index c1ab138f..873fd47d 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue @@ -13,23 +13,31 @@
新增 导出 - + 导入 - + - 删除 + + + 删除 + - 批量操作 + 批量操作 + +
- 已选择 {{ selectedRowKeys.length }}项 + 已选择 {{ selectedRowKeys.length }}项 清空
@@ -52,7 +60,8 @@ + + 管理 + 编辑 - + 详情 - + 删除 - +
+ \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue index 8d38564a..89a5c01d 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue @@ -76,6 +76,10 @@ + + 管理 + + 编辑 @@ -105,6 +109,7 @@
+ @@ -115,16 +120,19 @@ import {mixinDevice} from '@/utils/mixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin' import ZyClothsModularModal from './modules/ZyClothsModularModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' +import ZyClothsMcList from "@views/process/ZyClothsMcList"; export default { name: 'ZyClothsModularList', mixins: [JeecgListMixin, mixinDevice], components: { + ZyClothsMcList, ZyClothsModularModal }, data() { return { description: '制衣模块 zy_cloths_modular管理页面', + // 表头 columns: [ { @@ -147,11 +155,11 @@ export default { align: "center", dataIndex: 'modularName' }, - { - title: '制衣模块类型', - align: "center", - dataIndex: 'modularType_dictText' - }, + // { + // title: '模块部件名称', + // align: "center", + // dataIndex: 'modularType_dictText' + // }, { title: '描述', align: "center", @@ -178,6 +186,13 @@ export default { align: "center", dataIndex: 'createTime' }, + { + title: '模块部件', + dataIndex: 'action2', + align:"center", + // fixed:"right", + scopedSlots: { customRender: 'action2' } + }, { title: '操作', dataIndex: 'action', @@ -208,6 +223,12 @@ export default { }, }, methods: { + viewVid(record){ + this.$refs.ZyClothsMcList.showModal(); + this.$refs.ZyClothsMcList.edit(record); + console.log("zyclothsMclist"+record.ids); + this.$refs.ZyClothsMcList.disableSubmit = false; + }, initDictConfig() { }, getSuperFieldList() { diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcForm.vue new file mode 100644 index 00000000..4afd02e1 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcForm.vue @@ -0,0 +1,118 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal.vue new file mode 100644 index 00000000..aabf8ad0 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal.vue @@ -0,0 +1,66 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal__Style#Drawer.vue new file mode 100644 index 00000000..eb03a429 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccForm.vue new file mode 100644 index 00000000..a0c9e449 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccForm.vue @@ -0,0 +1,122 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal.vue new file mode 100644 index 00000000..096fc83b --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal.vue @@ -0,0 +1,66 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal__Style#Drawer.vue new file mode 100644 index 00000000..526aef63 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue index 26b4ee13..63952834 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue @@ -13,22 +13,22 @@ - - - - - + + + + + - + diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue index fe736fe0..67c3b4ba 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMcController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMcController.java new file mode 100644 index 00000000..9740ee69 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMcController.java @@ -0,0 +1,155 @@ +package org.jeecg.modules.demo.base.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.demo.base.entity.ZyClothsMc; +import org.jeecg.modules.demo.base.service.IZyClothsMcService; +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-14 + * @Version: V1.0 + */ +@Api(tags="制衣模块和模块部件中间表") +@RestController +@RequestMapping("/zyClothsMc/zyClothsMc") +@Slf4j +public class ZyClothsMcController extends JeecgController { + @Autowired + private IZyClothsMcService zyClothsMcService; + + /** + * 分页列表查询 + * + * @param zyClothsMc + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "制衣模块和模块部件中间表-分页列表查询") + @ApiOperation(value="制衣模块和模块部件中间表-分页列表查询", notes="制衣模块和模块部件中间表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyClothsMc zyClothsMc, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsMc, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyClothsMcService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyClothsMc + * @return + */ + @AutoLog(value = "制衣模块和模块部件中间表-添加") + @ApiOperation(value="制衣模块和模块部件中间表-添加", notes="制衣模块和模块部件中间表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyClothsMc zyClothsMc) { + zyClothsMcService.save(zyClothsMc); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyClothsMc + * @return + */ + @AutoLog(value = "制衣模块和模块部件中间表-编辑") + @ApiOperation(value="制衣模块和模块部件中间表-编辑", notes="制衣模块和模块部件中间表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyClothsMc zyClothsMc) { + zyClothsMcService.updateById(zyClothsMc); + 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) { + zyClothsMcService.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.zyClothsMcService.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) { + ZyClothsMc zyClothsMc = zyClothsMcService.getById(id); + if(zyClothsMc==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyClothsMc); + } + + /** + * 导出excel + * + * @param request + * @param zyClothsMc + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyClothsMc zyClothsMc) { + return super.exportXls(request, zyClothsMc, ZyClothsMc.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, ZyClothsMc.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMccController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMccController.java new file mode 100644 index 00000000..537206f1 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMccController.java @@ -0,0 +1,155 @@ +package org.jeecg.modules.demo.base.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.demo.base.entity.ZyClothsMcc; +import org.jeecg.modules.demo.base.service.IZyClothsMccService; +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-14 + * @Version: V1.0 + */ +@Api(tags="制衣模块部件和模块的中间表") +@RestController +@RequestMapping("/zyClothsMcc/zyClothsMcc") +@Slf4j +public class ZyClothsMccController extends JeecgController { + @Autowired + private IZyClothsMccService zyClothsMccService; + + /** + * 分页列表查询 + * + * @param zyClothsMcc + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "制衣模块部件和模块的中间表-分页列表查询") + @ApiOperation(value="制衣模块部件和模块的中间表-分页列表查询", notes="制衣模块部件和模块的中间表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyClothsMcc zyClothsMcc, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsMcc, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyClothsMccService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyClothsMcc + * @return + */ + @AutoLog(value = "制衣模块部件和模块的中间表-添加") + @ApiOperation(value="制衣模块部件和模块的中间表-添加", notes="制衣模块部件和模块的中间表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyClothsMcc zyClothsMcc) { + zyClothsMccService.save(zyClothsMcc); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyClothsMcc + * @return + */ + @AutoLog(value = "制衣模块部件和模块的中间表-编辑") + @ApiOperation(value="制衣模块部件和模块的中间表-编辑", notes="制衣模块部件和模块的中间表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyClothsMcc zyClothsMcc) { + zyClothsMccService.updateById(zyClothsMcc); + 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) { + zyClothsMccService.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.zyClothsMccService.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) { + ZyClothsMcc zyClothsMcc = zyClothsMccService.getById(id); + if(zyClothsMcc==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyClothsMcc); + } + + /** + * 导出excel + * + * @param request + * @param zyClothsMcc + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyClothsMcc zyClothsMcc) { + return super.exportXls(request, zyClothsMcc, ZyClothsMcc.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, ZyClothsMcc.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMc.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMc.java new file mode 100644 index 00000000..9bbf6cf5 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMc.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.demo.base.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-11-14 + * @Version: V1.0 + */ +@Data +@TableName("zy_cloths_mc") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_cloths_mc对象", description="制衣模块和模块部件中间表") +public class ZyClothsMc 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; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**模块id*/ + @Excel(name = "模块id", width = 15) + @ApiModelProperty(value = "模块id") + @Dict(dictTable = "zy_cloths_modular",dicText = "modular_name" ,dicCode = "id") + private String modularId; + /**模块部件id*/ + @Excel(name = "模块部件id", width = 15) + @ApiModelProperty(value = "模块部件id") + @Dict(dicCode = "zyModularType") + private String mccid; +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMcc.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMcc.java new file mode 100644 index 00000000..4435c2bd --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMcc.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.demo.base.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-11-14 + * @Version: V1.0 + */ +@Data +@TableName("zy_cloths_mcc") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_cloths_mcc对象", description="制衣模块部件和模块的中间表") +public class ZyClothsMcc 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; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**模块部件id*/ + @Excel(name = "模块部件id", width = 15) + @ApiModelProperty(value = "模块部件id") + @Dict(dicCode = "zyModularType") + private String mcid; + /**部件id*/ + @Excel(name = "部件id", width = 15) + @ApiModelProperty(value = "部件id") + @Dict(dictTable = "zy_cloths_component",dicText = "parts_name",dicCode = "id") + private String componendId; +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMcMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMcMapper.java new file mode 100644 index 00000000..05e9236e --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMcMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.demo.base.entity.ZyClothsMc; + +/** + * @Description: 制衣模块和模块部件中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +public interface ZyClothsMcMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMccMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMccMapper.java new file mode 100644 index 00000000..54332f29 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMccMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.demo.base.entity.ZyClothsMcc; + +/** + * @Description: 制衣模块部件和模块的中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +public interface ZyClothsMccMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMcMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMcMapper.xml new file mode 100644 index 00000000..a05402b1 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMcMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMccMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMccMapper.xml new file mode 100644 index 00000000..3afbe857 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMccMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMcService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMcService.java new file mode 100644 index 00000000..e9a6291d --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMcService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.base.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.demo.base.entity.ZyClothsMc; + +/** + * @Description: 制衣模块和模块部件中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +public interface IZyClothsMcService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMccService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMccService.java new file mode 100644 index 00000000..c1ea3ab0 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMccService.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.demo.base.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.demo.base.entity.ZyClothsMcc; + +; + +/** + * @Description: 制衣模块部件和模块的中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +public interface IZyClothsMccService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMcServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMcServiceImpl.java new file mode 100644 index 00000000..b53b88aa --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMcServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.demo.base.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.demo.base.entity.ZyClothsMc; +import org.jeecg.modules.demo.base.mapper.ZyClothsMcMapper; +import org.jeecg.modules.demo.base.service.IZyClothsMcService; +import org.springframework.stereotype.Service; + +/** + * @Description: 制衣模块和模块部件中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +@Service +public class ZyClothsMcServiceImpl extends ServiceImpl implements IZyClothsMcService { + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMccServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMccServiceImpl.java new file mode 100644 index 00000000..278611ce --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMccServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.base.service.impl; + +import org.jeecg.modules.demo.base.entity.ZyClothsMcc; +import org.jeecg.modules.demo.base.mapper.ZyClothsMccMapper; +import org.jeecg.modules.demo.base.service.IZyClothsMccService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 制衣模块部件和模块的中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +@Service +public class ZyClothsMccServiceImpl extends ServiceImpl implements IZyClothsMccService { + +} From e90909f844cc2ca834b17f905f82552afe4d6f8b Mon Sep 17 00:00:00 2001 From: mors <3067699729@qq.com> Date: Mon, 14 Nov 2022 18:35:10 +0800 Subject: [PATCH 8/8] =?UTF-8?q?2022-11-14=20=E8=B5=B5=E7=8E=89=E7=91=9E=20?= =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/process/ZyClothsMcList.vue | 78 +++++++++---------- .../src/views/process/ZyClothsMccList.vue | 14 ++-- .../process/ZyClothsModularCompentList.vue | 14 ++-- .../src/views/process/ZyClothsModularList.vue | 2 +- 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue index 2b0fc7e1..1dbb4e1e 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue @@ -9,29 +9,30 @@ @cancel="handleCancel" > -
- - - - -
+ + + + + +
新增 - 导出 - - 导入 - - - - - - 删除 - - 批量操作 - + + + + + + + + + + + + +
@@ -49,32 +50,31 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="false" + :pagination="ipagination" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap" :loading="loading" - @change="handleTableChange"> - - - + + + + + + + + + + + + + + + + + + + 编辑 diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue index 2ecb136e..5382b2ce 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue @@ -26,12 +26,12 @@ - - - 删除 - - 批量操作 - + + + + + + @@ -49,7 +49,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="false" + :pagination="ipagination" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap" diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue index 873fd47d..ad0c0f5f 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue @@ -1,12 +1,12 @@ - 管理 + 查看 编辑 diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue index 89a5c01d..914e8b35 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue @@ -77,7 +77,7 @@ - 管理 + 查看