diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue index b51ff49c..88aa62ba 100644 --- a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue +++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue @@ -8,7 +8,7 @@ - + @@ -83,6 +83,7 @@ data () { return { model:{ + nums:'' }, labelCol: { xs: { span: 24 }, @@ -107,7 +108,8 @@ url: { add: "/accessories/zyAccessories/add", edit: "/accessories/zyAccessories/edit", - queryById: "/accessories/zyAccessories/queryById" + queryById: "/accessories/zyAccessories/queryById", + sort:"/accessories/zyAccessories/sort" } } }, @@ -159,8 +161,19 @@ }, popupCallback(value,row){ this.model = Object.assign(this.model, row); - console.log(row); - }, + var n=10; + console.log(this.model) + getAction(this.url.sort, {id:this.model.typeId}).then((res)=>{ + console.log(res) + var num=parseInt(res.result,10)+1 + num=num.toString() + while(num.length \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesTypeForm.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesTypeForm.vue index 5eaba65e..046c9ac9 100644 --- a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesTypeForm.vue +++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesTypeForm.vue @@ -5,7 +5,7 @@ - + @@ -39,6 +39,7 @@ data () { return { model:{ + nums:'' }, labelCol: { xs: { span: 24 }, @@ -54,7 +55,8 @@ url: { add: "/accessories/zyAccessoriesType/add", edit: "/accessories/zyAccessoriesType/edit", - queryById: "/accessories/zyAccessoriesType/queryById" + queryById: "/accessories/zyAccessoriesType/queryById", + weiyi:"/accessories/zyAccessoriesType/weiyi" } } }, @@ -64,6 +66,15 @@ }, }, created () { + var n=4 + getAction(this.url.weiyi,null).then((res)=>{ + var num=parseInt(res.message,10)+1 + num=num.toString() + while(num.length + + + + + - + @@ -37,11 +42,11 @@ - - - - - + + + + + @@ -157,6 +162,7 @@ model:{ unit : '1', status : '1', + fabricNumber:'', }, labelCol: { xs: { span: 24 }, @@ -199,7 +205,8 @@ url: { add: "/fabric/zyFabric/add", edit: "/fabric/zyFabric/edit", - queryById: "/fabric/zyFabric/queryById" + queryById: "/fabric/zyFabric/queryById", + sort:"/fabric/zyFabric/sort" } } }, @@ -217,6 +224,20 @@ add () { this.edit(this.modelDefault); }, + gaibian(){ + var n=10; + console.log(this.model) + getAction(this.url.sort,this.model).then((res)=>{ + console.log(res) + var num=parseInt(res.result,10)+1 + num=num.toString() + while(num.length - + @@ -22,7 +22,7 @@ \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue index b8027c32..bed9aef8 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue @@ -79,13 +79,13 @@ - 编辑 + - + - 详情 - + + 删除 @@ -95,7 +95,7 @@ - + @@ -104,7 +104,7 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import ZyProcessAccessoriesModal from '@/views/cloths/modules/ZyProcessAccessoriesModal' + import ZyProcessAccessoriesModal from './ZyProcessAccessoriesModal' export default { name: 'ZyProcessAccessoriesList', @@ -195,6 +195,9 @@ this.visible = true; }, + valueChange(value){ + if (value) this.loadData() + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesModal.vue new file mode 100644 index 00000000..8e1883c8 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesModal.vue @@ -0,0 +1,94 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue index 0260f61f..b39a77d1 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue @@ -79,22 +79,25 @@ - 编辑 - - 详情 - + + + + 删除 - + + 升序 + + 降序 - + @@ -105,6 +108,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ZyProcessActionModal from './ZyProcessActionModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' + import {getAction} from "@api/manage"; export default { name: 'ZyProcessActionList', @@ -173,6 +177,8 @@ deleteBatch: "/pro/zyProcessAction/deleteBatch", exportXlsUrl: "/pro/zyProcessAction/exportXls", importExcelUrl: "pro/zyProcessAction/importExcel", + up:"/pro/zyProcessAction/up", + down:"/pro/zyProcessAction/down" }, dictOptions:{}, @@ -193,12 +199,30 @@ edit (record) { this.id = record; this.queryParam.processId=this.id; - console.log("燕慧森1号") this.url.list='/pro/zyProcessAction/list1' this.loadData(); this.visible = true; }, + up(id){ + getAction(this.url.up,{id:id}).then((res)=>{ + if(res.success){ + this.$message.success(res.message); + }else{ + this.$message.warning(res.message); + } + })}, + down(id){ + getAction(this.url.down,{id:id}).then((res)=>{ + if(res.success){ + this.$message.success(res.message); + }else{ + this.$message.warning(res.message); + } + })}, + valueChange(value){ + if (value) this.loadData() + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionModal.vue index da3d3288..80586a06 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionModal.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionModal.vue @@ -8,37 +8,47 @@ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @cancel="handleCancel" cancelText="关闭"> - + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue index 9f3b2a68..8f2eff00 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue @@ -84,13 +84,6 @@ - 编辑 - - - - - 详情 - 删除 @@ -100,7 +93,7 @@ - + @@ -109,7 +102,7 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import ZyProcessMachineModal from '@/views/cloths/modules/ZyProcessMachineModal' + import ZyProcessMachineModal from './ZyProcessMachineModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { @@ -194,10 +187,12 @@ }, }, methods: { + valueChange(value){ + if (value) this.loadData() + }, edit (record) { this.id = record; this.queryParam.processId=this.id; - console.log("燕慧森1号") this.loadData(); this.visible = true; diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineModal.vue new file mode 100644 index 00000000..24c6a945 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineModal.vue @@ -0,0 +1,84 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyAccessoriesList.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyAccessoriesList.vue new file mode 100644 index 00000000..17b2a9be --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyAccessoriesList.vue @@ -0,0 +1,159 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyClothActionList.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyClothActionList.vue new file mode 100644 index 00000000..ad7df5b9 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyClothActionList.vue @@ -0,0 +1,214 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyFabricList.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyFabricList.vue new file mode 100644 index 00000000..0ac99896 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyFabricList.vue @@ -0,0 +1,196 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue new file mode 100644 index 00000000..37f100ac --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue @@ -0,0 +1,193 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyToolList.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyToolList.vue new file mode 100644 index 00000000..df23758f --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyToolList.vue @@ -0,0 +1,154 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue index 57d22e83..92c18b29 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue @@ -215,9 +215,9 @@ export default { // scopedSlots: {customRender: 'action1'} // }, { - title: '用户名', + title: '企业', align: "center", - dataIndex: 'userId' + dataIndex: 'userId_dictText' }, { title: '创建时间', diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue index 935aac1b..9f095782 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue @@ -4,17 +4,18 @@ - - - + + + + dict-code="zy_cloths_style,style_names,nums"> + @@ -23,22 +24,27 @@ + dictCode="modenumber" @change="gaibian"> + + + + + + - - - - - - - + + + + + + + @@ -81,7 +87,9 @@ export default { selectedKey: '', // 款式id typeid: '', // 型号, serialNumber: '', // 顺序号 - model: {}, + model: { + nums:'', + }, labelCol: { xs: {span: 24}, sm: {span: 5}, @@ -93,12 +101,12 @@ export default { confirmLoading: false, /*效验规则*/ validatorRules: { - nums: [ - //{pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{4}$/, message: '4wei'}, - { required:true, message: '编号不能为空'}, - { pattern: /^[0-9A-Za-z]{0,10}$/, message: '编号太长'}, - //{pattern: /^(?=.*([0-9a-zA-Z]){5}).[A-Za-z0-9]+$/, message: '编号为四位'}, - ], + // nums: [ + // //{pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{4}$/, message: '4wei'}, + // { required:true, message: '编号不能为空'}, + // { pattern: /^[0-9A-Za-z]{0,20}$/, message: '编号太长'}, + // //{pattern: /^(?=.*([0-9a-zA-Z]){5}).[A-Za-z0-9]+$/, message: '编号为四位'}, + // ], styleId: [ {required: true, message: '款式不能为空'}, ], @@ -117,6 +125,7 @@ export default { add: "/zyclothsample/zyClothSample/add", edit: "/zyclothsample/zyClothSample/edit", queryById: "/zyclothsample/zyClothSample/queryById", + sort:"/zyclothsample/zyClothSample/sort" } } }, @@ -141,7 +150,19 @@ export default { this.edit(this.modelDefault); }, // - + gaibian(){ + var n=3; + console.log(this.model) + getAction(this.url.sort,this.model).then((res)=>{ + console.log(res) + var num=parseInt(res.result,10)+1 + num=num.toString() + while(num.length--> - - + + diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue index c9a96b1f..8e551899 100644 --- a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue @@ -38,13 +38,13 @@
新增 导出 - - 导入 - + + + + - + + diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue b/ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue index f95fda33..1b201efd 100644 --- a/ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue +++ b/ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue @@ -5,7 +5,7 @@ - {{biaoTi}}款式工序管理 + {{biaoTi}} @@ -16,13 +16,13 @@
新增 导出 - - 导入 - + + + + - + + diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue index 535e9ec7..b702ae1d 100644 --- a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue +++ b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue @@ -3,6 +3,7 @@
+
@@ -160,7 +161,7 @@ export default { }, //加载传递参数 loadParameter() { - if (this.loadRouteType == false) { + if (this.loadRouteType === false) { this.styleId = this.$route.query.styleId; console.log(this.styleId) this.loadRouteType = true; diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue index bee39186..a7ec8596 100644 --- a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue +++ b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue @@ -19,7 +19,6 @@ name: 'ZyStyleModularModal', components: { ZyProcessList, - }, data () { return { @@ -40,7 +39,7 @@ }, methods: { add () { - this.model.styleId=this.$route.query.id; + this.model.styleId=this.$route.query.id; this.visible=true this.$nextTick(()=>{ this.$refs.realForm.add(); diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java index f7d33790..1d5bb51b 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.demo.fabric.entity.ZyFabric; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -83,6 +84,12 @@ public class ZyAccessoriesController extends JeecgController add(@RequestBody ZyAccessories zyAccessories) { + QueryWrapper queryWrapper=new QueryWrapper(); + queryWrapper.eq("contents",zyAccessories.getContents()); + int a= zyAccessoriesService.count(queryWrapper); + if(a>=1){ + return Result.error("名称重复，请修改后重试！！"); + } zyAccessoriesService.save(zyAccessories); return Result.OK("添加成功！"); } @@ -97,6 +104,12 @@ public class ZyAccessoriesController extends JeecgController edit(@RequestBody ZyAccessories zyAccessories) { + QueryWrapper queryWrapper=new QueryWrapper(); + queryWrapper.eq("contents",zyAccessories.getContents()); + int a= zyAccessoriesService.count(queryWrapper); + if(a>=1){ + return Result.error("名称重复，请修改后重试！！"); + } zyAccessoriesService.updateById(zyAccessories); return Result.OK("编辑成功!"); } @@ -168,5 +181,14 @@ public class ZyAccessoriesController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, ZyAccessories.class); } - + @AutoLog(value = "排序") + @ApiOperation(value="排序", notes="排序") + @GetMapping(value = "/sort") + public Result sort(@RequestParam(name="id",required=true) String id) { + String s=zyAccessoriesService.findSort(id); + if(s==null){ + return Result.OK(0); + }else + return Result.OK(s.substring(6)); + } } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java index 476d310e..4d6992c1 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java @@ -83,6 +83,11 @@ public class ZyAccessoriesTypeController extends JeecgController add(@RequestBody ZyAccessoriesType zyAccessoriesType) { + QueryWrapper queryWrapper=new QueryWrapper(); + queryWrapper.eq("contents",zyAccessoriesType.getContents()); + int a=zyAccessoriesTypeService.count(queryWrapper); + if(a!=0) + return Result.error("名称重复，请重试！！！"); zyAccessoriesTypeService.save(zyAccessoriesType); return Result.OK("添加成功！"); } @@ -169,4 +174,13 @@ public class ZyAccessoriesTypeController extends JeecgController weiyi() { + + String a=zyAccessoriesTypeService.sort(); + if(a==null){ + return Result.ok(0); + } + return Result.ok(a); + } } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java index 8d718db0..258decea 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java @@ -38,7 +38,7 @@ public class ZyAccessories implements Serializable { /**类型id*/ @Excel(name = "类型id", width = 15) @ApiModelProperty(value = "类型id") - @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id") + @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "nums") private java.lang.String typeId; /**编号*/ @Excel(name = "编号", width = 15) diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesMapper.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesMapper.java index 097a36a6..4fe05db1 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesMapper.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesMapper.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.accessories.entity.ZyAccessories; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ZyAccessoriesMapper extends BaseMapper { + @Select("select nums from zy_accessories where type_id=#{id} order by nums desc limit 0,1 ") + String findSort(String id); } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesTypeMapper.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesTypeMapper.java index 395e9ba1..38a9b292 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesTypeMapper.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesTypeMapper.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.accessories.entity.ZyAccessoriesType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ZyAccessoriesTypeMapper extends BaseMapper { + @Select("select nums from zy_accessories_type order by nums desc limit 0,1") + String sort(); } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesService.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesService.java index 6e7f95d8..48609354 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesService.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyAccessoriesService extends IService { + String findSort(String id); } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesTypeService.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesTypeService.java index d3d35c8f..6473ffd6 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesTypeService.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesTypeService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyAccessoriesTypeService extends IService { + String sort(); } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesServiceImpl.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesServiceImpl.java index f6ff929d..9cfabcaa 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.service.impl; import org.jeecg.modules.demo.accessories.entity.ZyAccessories; import org.jeecg.modules.demo.accessories.mapper.ZyAccessoriesMapper; import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyAccessoriesServiceImpl extends ServiceImpl implements IZyAccessoriesService { + @Autowired + ZyAccessoriesMapper zyAccessoriesMapper; + @Override + public String findSort(String id) { + return zyAccessoriesMapper.findSort(id); + } } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesTypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesTypeServiceImpl.java index 16f315ba..7ee8b1f6 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesTypeServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesTypeServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.service.impl; import org.jeecg.modules.demo.accessories.entity.ZyAccessoriesType; import org.jeecg.modules.demo.accessories.mapper.ZyAccessoriesTypeMapper; import org.jeecg.modules.demo.accessories.service.IZyAccessoriesTypeService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyAccessoriesTypeServiceImpl extends ServiceImpl implements IZyAccessoriesTypeService { + @Autowired + ZyAccessoriesTypeMapper zyAccessoriesTypeMapper; + @Override + public String sort() { + return zyAccessoriesTypeMapper.sort(); + } } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java index 38aac068..d5556303 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java @@ -357,5 +357,15 @@ public class ZyFabricController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, ZyFabric.class); } + @AutoLog(value = "排序") + @ApiOperation(value="排序", notes="排序") + @GetMapping(value = "/sort") + public Result sort(ZyFabric zyFabric) { + String s=zyFabricService.findSort(zyFabric.getTypeId(),zyFabric.getMaterial()); + if(s==null){ + return Result.OK(0); + }else + return Result.OK(s.substring(6)); + } } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricTypeController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricTypeController.java index 10bd9486..fb55f3c7 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricTypeController.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricTypeController.java @@ -201,4 +201,13 @@ public class ZyFabricTypeController extends JeecgController weiyi(@RequestParam(name="id",required=true) String id) { + + String a=zyFabricTypeService.sort(); + if(a==null){ + return Result.ok(0); + } + return Result.ok(a); + } } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java index 68fd858e..9faf2297 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java @@ -67,7 +67,7 @@ public class ZyFabric implements Serializable { private java.lang.String imageUrl; /**面料类型id*/ @Excel(name = "类型", width = 15 , dictTable = "zy_fabric_type", dicText = "content", dicCode = "id") - @Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "id") + @Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "nums") @ApiModelProperty(value = "类型") private java.lang.String typeId; diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricMapper.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricMapper.java index c6830c89..c6e12195 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricMapper.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricMapper.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.fabric.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.fabric.entity.ZyFabric; import org.jeecg.modules.demo.statistic.vo.StaticDayVo; @@ -53,4 +54,7 @@ public interface ZyFabricMapper extends BaseMapper { @Select("select id from zy_fabric_type where content like #{s}") List findAllid(String s); + + @Select("select fabric_number from zy_fabric where type_id=#{typeId} and material=#{material} order by fabric_number desc limit 0,1") + String findSort(@Param("typeId") String typeId, @Param("material") String material); } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricTypeMapper.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricTypeMapper.java index 9e101ddc..e095419f 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricTypeMapper.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricTypeMapper.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.fabric.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.fabric.entity.ZyFabricType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ZyFabricTypeMapper extends BaseMapper { + @Select("select nums from zy_fabric_type order by nums desc limit 0,1") + String sort(); } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricService.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricService.java index 13a23146..a03c8005 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricService.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricService.java @@ -70,4 +70,6 @@ public interface IZyFabricService extends IService { public StaticThreeVo staticThreeNum(); List findAllId(String s); + + String findSort(String typeId, String material); } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricTypeService.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricTypeService.java index d8ca1d74..2423afea 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricTypeService.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricTypeService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyFabricTypeService extends IService { + String sort(); } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricServiceImpl.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricServiceImpl.java index 28b1292a..e8658558 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricServiceImpl.java @@ -180,6 +180,11 @@ public class ZyFabricServiceImpl extends ServiceImpl i return zyFabricMapper.findAllid(s); } + @Override + public String findSort(String typeId, String material) { + return zyFabricMapper.findSort(typeId,material); + } + /** * 逻辑：单个货品的扫码出库，旧的删掉对应的库存表中的库存减一，生成新的二维码 * @param fabric diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricTypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricTypeServiceImpl.java index 3e0c213d..8e32423f 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricTypeServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricTypeServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.fabric.service.impl; import org.jeecg.modules.demo.fabric.entity.ZyFabricType; import org.jeecg.modules.demo.fabric.mapper.ZyFabricTypeMapper; import org.jeecg.modules.demo.fabric.service.IZyFabricTypeService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyFabricTypeServiceImpl extends ServiceImpl implements IZyFabricTypeService { + @Autowired + ZyFabricTypeMapper zyFabricTypeMapper; + @Override + public String sort() { + return zyFabricTypeMapper.sort(); + } } diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java index 0444a4d0..f697df02 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java @@ -68,5 +68,5 @@ public class ZyStyleModular implements Serializable { /**序号*/ @Excel(name = "序号", width = 15,dicCode = "序号") @ApiModelProperty(value = "序号") - private Integer order; + private Integer serialnumber; } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothActionController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothActionController.java index b51a8218..b36181ff 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothActionController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothActionController.java @@ -167,5 +167,10 @@ public class ZyClothActionController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, ZyClothAction.class); } + @GetMapping(value = "/sort") + public Result sort(){ + String s=zyClothActionService.sort(); + return Result.ok(s.substring(1)); + } } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java index b6a5890e..8b9950ba 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.demo.base.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -88,6 +89,16 @@ public class ZyClothsComponentController extends JeecgController add(@RequestBody ZyClothsComponent zyClothsComponent) { + //编码规则：服装类型（10）+序号（8） + zyClothsComponent.setNums(zyClothsComponentService.generateNumber(zyClothsComponent)); + //部件名称不能重复 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + List zyClothsComponentList = zyClothsComponentService.list(queryWrapper); + for (ZyClothsComponent zy : zyClothsComponentList) { + if (zyClothsComponent.getPartsName().equals(zy.getPartsName())){ + return Result.error("添加失败！数据已存在"); + } + } zyClothsComponentService.save(zyClothsComponent); return Result.OK("添加成功！"); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java index 51098213..bcec6b5d 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.base.entity.ZyClothsComponent; import org.jeecg.modules.demo.base.entity.ZyClothsModular; import org.jeecg.modules.demo.base.entity.ZyClothsType; import org.jeecg.modules.demo.base.service.IZyClothsModularService; @@ -105,6 +106,13 @@ public class ZyClothsModularController extends JeecgController add(@RequestBody ZyClothsModular zyClothsModular) { //nums，编号，varchar，18，非空，不重复，编码规则：服装类型（10）+序号（8） zyClothsModular.setNums(zyClothsModularService.generateNumber(zyClothsModular)); + //模块名称不能重复 + List zyClothsModularList = zyClothsModularService.list(); + for (ZyClothsModular zy : zyClothsModularList) { + if (zyClothsModular.getModularName().equals(zy.getModularName())){ + return Result.error("添加失败！模块名称已存在"); + } + } zyClothsModularService.save(zyClothsModular); return Result.OK("添加成功！"); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java index 8688b0da..4419349c 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java @@ -9,6 +9,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -27,6 +28,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -36,133 +38,144 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; - /** +/** * @Description: zy_cloths_type * @Author: jeecg-boot - * @Date: 2021-11-10 + * @Date: 2021-11-10 * @Version: V1.0 */ -@Api(tags="zy_cloths_type") +@Api(tags = "zy_cloths_type") @RestController @RequestMapping("/base/zyClothsType") @Slf4j public class ZyClothsTypeController extends JeecgController { - @Autowired - private IZyClothsTypeService zyClothsTypeService; + @Autowired + private IZyClothsTypeService zyClothsTypeService; - /** - * 分页列表查询 - * - * @param zyClothsType - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "zy_cloths_type-分页列表查询") - @ApiOperation(value="zy_cloths_type-分页列表查询", notes="zy_cloths_type-分页列表查询") - @GetMapping(value = "/list") - public Result queryPageList(ZyClothsType zyClothsType, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = zyClothsTypeService.page(page, queryWrapper); - return Result.OK(pageList); - } + /** + * 分页列表查询 + * + * @param zyClothsType + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "zy_cloths_type-分页列表查询") + @ApiOperation(value = "zy_cloths_type-分页列表查询", notes = "zy_cloths_type-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyClothsType zyClothsType, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyClothsTypeService.page(page, queryWrapper); + return Result.OK(pageList); + } - /** - * 添加 - * - * @param zyClothsType - * @return - */ - @AutoLog(value = "zy_cloths_type-添加") - @ApiOperation(value="zy_cloths_type-添加", notes="zy_cloths_type-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody ZyClothsType zyClothsType) { - zyClothsTypeService.save(zyClothsType); - return Result.OK("添加成功！"); - } + /** + * 添加 + * + * @param zyClothsType + * @return + */ + @AutoLog(value = "zy_cloths_type-添加") + @ApiOperation(value = "zy_cloths_type-添加", notes = "zy_cloths_type-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyClothsType zyClothsType) { + //类型名称输入时没有最大长度限制，提交时才提示。前端校验、后台校验 + //type_name，类型名称，varchar，50，非空，同类型下不重复 + String typeName = zyClothsType.getTypeName(); + if (!StringUtils.hasText(typeName)) { + return Result.error("类型名称 不能为空"); + } + if (typeName.length() > 10) { + return Result.error("类型名称长度不能超过10"); + } + //生成编号 nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）在service层处理 + zyClothsType.setNums(zyClothsTypeService.generateNumber()); + zyClothsTypeService.save(zyClothsType); + return Result.OK("添加成功！"); + } - /** - * 编辑 - * - * @param zyClothsType - * @return - */ - @AutoLog(value = "zy_cloths_type-编辑") - @ApiOperation(value="zy_cloths_type-编辑", notes="zy_cloths_type-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody ZyClothsType zyClothsType) { - zyClothsTypeService.updateById(zyClothsType); - return Result.OK("编辑成功!"); - } + /** + * 编辑 + * + * @param zyClothsType + * @return + */ + @AutoLog(value = "zy_cloths_type-编辑") + @ApiOperation(value = "zy_cloths_type-编辑", notes = "zy_cloths_type-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyClothsType zyClothsType) { + zyClothsTypeService.updateById(zyClothsType); + return Result.OK("编辑成功!"); + } - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "zy_cloths_type-通过id删除") - @ApiOperation(value="zy_cloths_type-通过id删除", notes="zy_cloths_type-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - zyClothsTypeService.removeById(id); - return Result.OK("删除成功!"); - } + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "zy_cloths_type-通过id删除") + @ApiOperation(value = "zy_cloths_type-通过id删除", notes = "zy_cloths_type-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + zyClothsTypeService.removeById(id); + return Result.OK("删除成功!"); + } - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "zy_cloths_type-批量删除") - @ApiOperation(value="zy_cloths_type-批量删除", notes="zy_cloths_type-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.zyClothsTypeService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "zy_cloths_type-批量删除") + @ApiOperation(value = "zy_cloths_type-批量删除", notes = "zy_cloths_type-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.zyClothsTypeService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "zy_cloths_type-通过id查询") - @ApiOperation(value="zy_cloths_type-通过id查询", notes="zy_cloths_type-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ZyClothsType zyClothsType = zyClothsTypeService.getById(id); - if(zyClothsType==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(zyClothsType); - } + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "zy_cloths_type-通过id查询") + @ApiOperation(value = "zy_cloths_type-通过id查询", notes = "zy_cloths_type-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ZyClothsType zyClothsType = zyClothsTypeService.getById(id); + if (zyClothsType == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyClothsType); + } /** - * 导出excel - * - * @param request - * @param zyClothsType - */ + * 导出excel + * + * @param request + * @param zyClothsType + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, ZyClothsType zyClothsType) { return super.exportXls(request, zyClothsType, ZyClothsType.class, "制衣类型表"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, ZyClothsType.class); diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java index 7448ca16..64c98d96 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java @@ -52,6 +52,12 @@ public class ZyClothsComponent implements Serializable { @Excel(name = "图片地址", width = 15) @ApiModelProperty(value = "图片地址") private java.lang.String pictureUrl; + /**服装类型id*/ + @Excel(name = "服装类型id", width = 15, dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id") + @Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id") + @ApiModelProperty(value = "服装类型id") + private java.lang.String clothsTypeId; + /**模块*/ @Excel(name = "模块", width = 15, dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id") @Dict(dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id") diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java index 4595a4d8..96c3b8fe 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java @@ -179,7 +179,7 @@ public class ZyProcess implements Serializable { */ @Excel(name = "类型名称", width = 15) @ApiModelProperty(value = "类型名称") - @Dict(dictTable = "zy_cloths_type", dicText = "zy_cloths_type", dicCode = "nums") + @Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "nums") private java.lang.String styleId; /** * 工段代码 diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothActionMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothActionMapper.java index d988e941..aa6d1ae4 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothActionMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothActionMapper.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.base.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.base.entity.ZyClothAction; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ZyClothActionMapper extends BaseMapper { + @Select("select nums from zy_cloth_action order by nums desc limit 0,1") + String sort(); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java index febcf394..c65c3a5d 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java @@ -22,4 +22,6 @@ public interface ZyClothsComponentMapper extends BaseMapper { public List selectByModular(@Param("modular_id")String modular_id); String getComponentNameById(String componentId); + + List selectNumsList2(); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java index 9d63f5bb..ebe37d59 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ZyClothsTypeMapper extends BaseMapper { + List selectNumsList(); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml index 00fd10ba..bf05980e 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml @@ -29,4 +29,8 @@ from zy_cloths_component where id = #{componentId} + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsTypeMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsTypeMapper.xml index 5111558b..3651d8fe 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsTypeMapper.xml +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsTypeMapper.xml @@ -2,4 +2,8 @@ + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothActionService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothActionService.java index e34482ea..bd9c3fa3 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothActionService.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothActionService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyClothActionService extends IService { + String sort(); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsComponentService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsComponentService.java index 7f30145b..d5a0ea36 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsComponentService.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsComponentService.java @@ -18,4 +18,7 @@ public interface IZyClothsComponentService extends IService { List selectList(String id); public List selectByModular(String modular_id); + + /**编码规则：服装类型（10）+序号（8）*/ + String generateNumber(ZyClothsComponent zyClothsComponent); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java index 0c926d2b..0f1b4359 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java @@ -11,4 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyClothsTypeService extends IService { + /**nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）*/ + String generateNumber(); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothActionServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothActionServiceImpl.java index 3c6399e9..ba424977 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothActionServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothActionServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.base.service.impl; import org.jeecg.modules.demo.base.entity.ZyClothAction; import org.jeecg.modules.demo.base.mapper.ZyClothActionMapper; import org.jeecg.modules.demo.base.service.IZyClothActionService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyClothActionServiceImpl extends ServiceImpl implements IZyClothActionService { + @Autowired + ZyClothActionMapper zyClothActionMapper; + @Override + public String sort() { + return zyClothActionMapper.sort(); + } } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java index 8b16bb79..ceb26aac 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java @@ -2,16 +2,23 @@ package org.jeecg.modules.demo.base.service.impl; import org.jeecg.modules.demo.base.entity.ZyClothsComponent; import org.jeecg.modules.demo.base.entity.ZyClothsModular; +import org.jeecg.modules.demo.base.entity.ZyClothsType; import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo; import org.jeecg.modules.demo.base.mapper.ZyClothsComponentMapper; import org.jeecg.modules.demo.base.mapper.ZyClothsModularMapper; +import org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper; import org.jeecg.modules.demo.base.service.IZyClothsComponentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.util.StringUtils; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.regex.Pattern; /** * @Description: zy_cloths_component @@ -21,8 +28,10 @@ import java.util.List; */ @Service public class ZyClothsComponentServiceImpl extends ServiceImpl implements IZyClothsComponentService { - @Autowired + @Resource private ZyClothsComponentMapper zyClothsComponentMapper; + @Resource + ZyClothsTypeMapper zyClothsTypeMapper; @Override public List selectList(String id) { @@ -30,9 +39,43 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl zyProcessVoList=baseMapper.selectProcessVo(list); return zyProcessVoList; } - + @Override public List selectByModular(String modular_id) { return zyClothsComponentMapper.selectByModular(modular_id); } + + /** + * 编码规则：服装类型（10）+序号（8） + */ + @Override + public String generateNumber(ZyClothsComponent zyClothsComponent) { + String nums = zyClothsComponent.getClothsTypeId(); + ZyClothsType zyClothsType = zyClothsTypeMapper.selectById(nums); + String nums1 = zyClothsType.getNums(); + //String substring = nums.substring(nums.length() - 10); + String format = String.format("%06d", orderNumber()); + return nums1 + format; + } + + private Long orderNumber() { + List listString = zyClothsComponentMapper.selectNumsList2(); + //System.err.println(listString); + List listLong = new ArrayList<>(); + for (String nums : listString) { + String REGEX = "[^0-9]"; + String newNums = Pattern.compile(REGEX).matcher(nums).replaceAll("").trim(); + if (!StringUtils.hasText(newNums)){ + newNums = "0"; + } + if (newNums.length() > 8) { + String substring = nums.substring(nums.length() - 8); + listLong.add(Long.valueOf(substring)); + }else { + listLong.add(Long.valueOf(newNums)); + } + } + System.out.println(listLong); + return Collections.max(listLong)+1; + } } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularServiceImpl.java index e228e589..7484c9f6 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularServiceImpl.java @@ -1,7 +1,9 @@ package org.jeecg.modules.demo.base.service.impl; import org.jeecg.modules.demo.base.entity.ZyClothsModular; +import org.jeecg.modules.demo.base.entity.ZyClothsType; import org.jeecg.modules.demo.base.mapper.ZyClothsModularMapper; +import org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper; import org.jeecg.modules.demo.base.service.IZyClothsModularService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,6 +26,8 @@ import java.util.regex.Pattern; public class ZyClothsModularServiceImpl extends ServiceImpl implements IZyClothsModularService { @Resource private ZyClothsModularMapper zyClothsModularMapper; + @Resource + ZyClothsTypeMapper zyClothsTypeMapper; @Override public List selectByType(String cloths_type_id) { @@ -36,9 +40,11 @@ public class ZyClothsModularServiceImpl extends ServiceImpl implements IZyClothsTypeService { + @Resource + ZyClothsTypeMapper zyClothsTypeMapper; + /** + * nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6） + */ + @Override + public String generateNumber() { + //先拿到类型编号 + String nums = "QIYE"; + //再来一个顺序号 + String format = String.format("%06d", orderNumber()); + //生成编码 + String result = nums + format; + System.err.println(result); + return nums + format; + } + + private Long orderNumber() { + List listString = zyClothsTypeMapper.selectNumsList(); + System.out.println(listString); + List listLong = new ArrayList<>(); + for (String nums : listString) { + System.err.println(nums); + String REGEX = "[^0-9]"; + //只要数字 + String newNums = Pattern.compile(REGEX).matcher(nums).replaceAll("").trim(); + System.err.println(newNums); + if (!StringUtils.hasText(newNums)){ + newNums = "0"; + } + if (newNums.length() > 6) { + //拿到后6位 + String substring = newNums.substring(newNums.length() - 6); + listLong.add(Long.valueOf(substring)); + }else { + listLong.add(Long.valueOf(newNums)); + } + } + return Collections.max(listLong)+1; + } } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java index 4fccd6a8..e01d31cc 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java @@ -109,13 +109,17 @@ public class ZyProcessAccessoriesController extends JeecgController add(@RequestBody ZyProcessAccessories zyProcessAccessories) { + String[] split = zyProcessAccessories.getAccessoriesId().split(","); + for (String k : split) { + zyProcessAccessories.setAccessoriesId(k); QueryWrapper s=new QueryWrapper(); s.eq("process_id",zyProcessAccessories.getProcessId()); s.eq("accessories_id",zyProcessAccessories.getAccessoriesId()); int a=zyProcessAccessoriesService.count(s); - if(a>=1) - return Result.error("已存在本信息"); + if(a==0) zyProcessAccessoriesService.save(zyProcessAccessories); + zyProcessAccessories.setId(null); + } return Result.OK("添加成功！"); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java index eae93464..1fb140e2 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java @@ -108,13 +108,18 @@ public class ZyProcessActionController extends JeecgController add(@RequestBody ZyProcessAction zyProcessAction) { - QueryWrapper s=new QueryWrapper(); - s.eq("process_id",zyProcessAction.getProcessId()); - s.eq("action_id",zyProcessAction.getActionId()); - int a=zyProcessActionService.count(s); - if(a>=1) - return Result.error("已存在本信息"); - zyProcessActionService.save(zyProcessAction); + String[] split = zyProcessAction.getActionId().split(","); + for (String k : split) { + zyProcessAction.setActionId(k); + QueryWrapper s=new QueryWrapper(); + s.eq("process_id",zyProcessAction.getProcessId()); + s.eq("action_id",zyProcessAction.getActionId()); + int a=zyProcessActionService.count(s); + if(a==0) + zyProcessActionService.save(zyProcessAction); + zyProcessAction.setId(null); + } + return Result.OK("添加成功！"); } @@ -205,5 +210,22 @@ public class ZyProcessActionController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, ZyProcessAction.class); } + @AutoLog(value = "排序") + @ApiOperation(value="排序", notes="排序") + @GetMapping(value = "/up") + public Result shang(@RequestParam(name="id",required=true) String id) { + zyProcessActionService.up(id); + return Result.ok("升序成功"); + } + @AutoLog(value = "排序") + @ApiOperation(value="排序", notes="排序") + @GetMapping(value = "/down") + public Result xia(@RequestParam(name="id",required=true) String id) { + int a=zyProcessActionService.findSort(id); + if(a==0) + return Result.error("当前已经是最低级别！！！"); + zyProcessActionService.down(id); + return Result.ok("降序成功"); + } } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java index f06fb4f2..d0881c70 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java @@ -106,13 +106,17 @@ public class ZyProcessFabricController extends JeecgController add(@RequestBody ZyProcessFabric zyProcessFabric) { + String[] split = zyProcessFabric.getFabricId().split(","); + for (String k : split) { + zyProcessFabric.setFabricId(k); QueryWrapper s=new QueryWrapper(); s.eq("process_id",zyProcessFabric.getProcessId()); s.eq("fabric_id",zyProcessFabric.getFabricId()); int a=zyProcessFabricService.count(s); - if(a>=1) - return Result.error("已存在本信息"); + if(a==0) zyProcessFabricService.save(zyProcessFabric); + zyProcessFabric.setId(null); + } return Result.OK("添加成功！"); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java index c7d7dafc..2afaaf83 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java @@ -105,13 +105,17 @@ public class ZyProcessMachineController extends JeecgController add(@RequestBody ZyProcessMachine zyProcessMachine) { + String[] split = zyProcessMachine.getMachineId().split(","); + for (String k : split) { + zyProcessMachine.setMachineId(k); QueryWrapper s=new QueryWrapper(); s.eq("process_id",zyProcessMachine.getProcessId()); s.eq("machine_id",zyProcessMachine.getMachineId()); int a=zyProcessMachineService.count(s); - if(a>=1) - return Result.error("已存在本信息"); + if(a==0) zyProcessMachineService.save(zyProcessMachine); + zyProcessMachine.setId(null); + } return Result.OK("添加成功！"); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java index 370dd852..32b73cd5 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java @@ -52,7 +52,7 @@ public class ZyProcessComponent implements Serializable { /**序号*/ @Excel(name = "序号", width = 15,dicCode = "序号") @ApiModelProperty(value = "序号") - private Integer order; + private Integer serialnumber; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java index 584e11c0..7b9c6d07 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import org.jeecg.modules.demo.base.entity.ZyClothAction; import org.jeecg.modules.demo.pro.entity.ZyProcessAction; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -25,4 +26,12 @@ public interface ZyProcessActionMapper extends BaseMapper { IPage page1(Page page, @Param("p") String s, @Param("m") String t); @Select("select * from zy_cloth_action where id in (select action_id from zy_process_action where process_id=#{id}) ") List selectByid(String id); + + @Update("UPDATE zy_process_action SET sort_action=sort_action+1 WHERE id=#{id} ") + void up(String id); + @Update("UPDATE zy_process_action SET sort_action=sort_action-1 WHERE id=#{id} ") + void down(String id); + + @Select("select sort_action from zy_process_action where id=#{id} ") + int findSort(String id); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java index db1e0a9f..b506ed26 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java @@ -22,4 +22,10 @@ public interface IZyProcessActionService extends IService { IPage page1(Page page, String s, String t); List selectByid(String id); + + void up(String id); + + int findSort(String id); + + void down(String id); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java index e34fced3..c1b7432d 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java @@ -39,4 +39,19 @@ public class ZyProcessActionServiceImpl extends ServiceImpl selectByid(String id) { return zyProcessActionMapper.selectByid(id); } + + @Override + public void up(String id) { + zyProcessActionMapper.up(id); + } + + @Override + public int findSort(String id) { + return zyProcessActionMapper.findSort(id); + } + + @Override + public void down(String id) { + zyProcessActionMapper.down(id); + } } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java index 97066141..34961978 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java @@ -119,6 +119,18 @@ public class ZyDevicetypeController extends JeecgController queryPageList1(ZyDevicetype zyDevicetype, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyDevicetype, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyDevicetypeService.page(page, queryWrapper); + return Result.OK(pageList); + } /** diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java index d76f7a37..ab62d81b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java @@ -50,7 +50,6 @@ public class ZyOperationtoolController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyOperationtool, req.getParameterMap()); - System.out.println("asdadad*********************************************"); String s=null,t=null; if(zyOperationtool.getOperationid()!=null){ s="%"+zyOperationtool.getOperationid()+"%"; @@ -89,13 +88,17 @@ public class ZyOperationtoolController extends JeecgController add(@RequestBody ZyOperationtool zyOperationtool) { + String[] split = zyOperationtool.getToolid().split(","); + for (String k : split) { + zyOperationtool.setToolid(k); QueryWrapper s=new QueryWrapper(); s.eq("operationid",zyOperationtool.getOperationid()); s.eq("toolid",zyOperationtool.getToolid()); int a=zyOperationtoolService.count(s); - if(a>=1) - return Result.error("已存在本信息"); + if(a==0) zyOperationtoolService.save(zyOperationtool); + zyOperationtool.setId(null); + } return Result.OK("添加成功！"); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java index d388e6ee..dfc0b405 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java @@ -20,6 +20,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface ZyOperationtoolMapper extends BaseMapper { @Select("") IPage page(Page page, @Param("p") String s, @Param("m") String t); - @Select("") + @Select("") IPage page1(Page page, @Param("p") String s, @Param("m") String t); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java index 57e83acc..c24f3d21 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java @@ -65,5 +65,5 @@ public class ZyProcessModular implements Serializable { /**序号*/ @Excel(name = "序号", width = 15,dicCode = "序号") @ApiModelProperty(value = "序号") - private Integer order; + private Integer serialnumber; } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/controller/ZyClothSampleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/controller/ZyClothSampleController.java index 8c9f6b6a..587f20eb 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/controller/ZyClothSampleController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/controller/ZyClothSampleController.java @@ -185,4 +185,15 @@ public class ZyClothSampleController extends JeecgController sort(ZyClothSample zyClothSample) { + String s=zyClothSampleService.findSort(zyClothSample.getStyleId(),zyClothSample.getStylemodelId()); + if(s==null){ + return Result.OK(0); + }else + return Result.OK(s.substring(21)); + } + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java index fad0c2f7..64a04bb6 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java @@ -47,7 +47,7 @@ public class ZyClothSample implements Serializable { */ @Excel(name = "款式", width = 15) @ApiModelProperty(value = "款式") - @Dict(dicCode = "id",dictTable = "zy_cloths_style",dicText = "style_names") + @Dict(dicCode = "nums",dictTable = "zy_cloths_style",dicText = "style_names") private String styleId; /**型号*/ @Excel(name = "型号", width = 15) @@ -69,6 +69,7 @@ public class ZyClothSample implements Serializable { /**用户*/ @Excel(name = "用户", width = 15) @ApiModelProperty(value = "用户") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") private String userId; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java index d9e80ba0..e77c0c66 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java @@ -3,6 +3,7 @@ package org.jeecg.modules.zyclothsample.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.zyclothsample.entity.ZyClothSample; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -15,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface ZyClothSampleMapper extends BaseMapper { + @Select("select nums from zy_cloth_sample where style_id=#{styleId} and stylemodel_id=#{stylemodelId} order by nums desc limit 0,1") + String findSort(@Param("styleId") String styleId, @Param("stylemodelId") String stylemodelId); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java index 6ace1925..8c63f4cd 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyClothSampleService extends IService { + String findSort(String styleId, String stylemodelId); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java index 6684fbfa..9752a8f9 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.zyclothsample.service.impl; import org.jeecg.modules.zyclothsample.entity.ZyClothSample; import org.jeecg.modules.zyclothsample.mapper.ZyClothSampleMapper; import org.jeecg.modules.zyclothsample.service.IZyClothSampleService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyClothSampleServiceImpl extends ServiceImpl implements IZyClothSampleService { + @Autowired + ZyClothSampleMapper zyClothSampleMapper; + @Override + public String findSort(String styleId, String stylemodelId) { + return zyClothSampleMapper.findSort(styleId,stylemodelId); + } } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java index 2d9c44ed..9b6ce4ef 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java @@ -3,6 +3,8 @@ package org.jeecg.modules.zyclothsstyle.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.bytedeco.javacpp.freenect; +import org.jeecg.modules.demo.base.entity.ZyClothsType; +import org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper; import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper; import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; @@ -30,6 +32,8 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl