diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
index f920ec33..272f403e 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
@@ -200,9 +200,9 @@ export default {
this.yid = this.model.id;
this.biaoTi = record.modularName+" 模块部件管理";
//this.title = record.modularName;
- console.log("+++++ this.biaoTi "+ this.biaoTi)
+ //console.log("+++++ this.biaoTi "+ this.biaoTi)
this.queryParam.modularId = this.model.id;
- console.log("+++++ this.queryParam.modularId: " + this.queryParam.modularId);
+ //console.log("+++++ this.queryParam.modularId: " + this.queryParam.modularId);
this.loadData();
this.visible = true;
},
@@ -215,10 +215,10 @@ export default {
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
- }, 2000);
+ }, 1000);
},
handleCancel(e) {
- console.log('Clicked cancel button');
+ //console.log('Clicked cancel button');
this.visible = false;
},
diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue
index 09bf3ebe..d4dc5ee1 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue
@@ -21,6 +21,14 @@
+
+
+
+
+
+
+
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
index 37cf61df..92604697 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
@@ -215,7 +215,6 @@
// },
add () {
this.edit(this.modelDefault);
-
},
edit (record) {
this.model = Object.assign({}, record);
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 a19c154f..8c4b3942 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue
@@ -98,6 +98,7 @@ export default {
add1(id) {
this.edit(this.modelDefault);
this.model.modularId = id;
+ console.log("form11111")
},
edit(record) {
this.model = Object.assign({}, record);
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
index 010a3f49..4ca31dff 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
@@ -37,6 +37,7 @@
visible: false,
disableSubmit: false,
url: {
+ list: "/base/zyClothsModularCompent/list",
add: "/base/zyClothsModularCompent/add",
edit: "/base/zyClothsModularCompent/edit",
queryById: "/base/zyClothsModularCompent/queryById"
@@ -48,7 +49,7 @@
//this.model.componentId = this.$route.query.id;
//模块名称 根据id显示模块的名称
this.model.modularId = id;
- console.log('this.modularId'+id)
+ console.log('this.modularId + modal33333'+id)
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add1(id);
@@ -71,8 +72,11 @@
// this.$refs.realForm.submitForm();
postAction(this.url.add, this.model).then((res) => {
if (res.success) {
+ console.log(111)
this.$message.success(res.message);
+ //this.loadData()
} else {
+ console.log(222)
this.$message.warning(res.message);
}
this.$emit('valueChange', 1)
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal__Style#Drawer.vue
index 1edd96f4..273c8786 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal__Style#Drawer.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal__Style#Drawer.vue
@@ -34,6 +34,7 @@
},
methods: {
add () {
+ console.log("modal style")
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
index cd9d7b39..c2cd8e20 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
@@ -5,7 +5,7 @@
-
+
@@ -44,9 +44,10 @@
@@ -474,7 +480,8 @@ export default {
.ant-form-item {
margin-bottom: 16px;
}
-/deep/ .label label{
- text-align:left;
+
+/deep/ .label label {
+ text-align: left;
}
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue b/ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue
index 4fb30ec3..b6603011 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue
@@ -5,8 +5,8 @@
-
- {{biaoTi}}
+
+ {{biaoTi}}
@@ -16,7 +16,7 @@
返回
-
+
+
保存
@@ -72,7 +74,7 @@ export default {
// 工具栏的按钮配置
toolbarConfig: {
// add 新增按钮；remove 删除按钮；clearSelection 清空选择按钮
- btn: ['add']
+ btn: ['add'],
},
validatorRules: {
styleId: [
@@ -223,7 +225,7 @@ export default {
loadParameter() {
if (this.loadRouteType === false) {
this.id = this.$route.query.id;
- this.biaoTi = this.$route.query.styleNames+"款式型号管理";
+ this.biaoTi = this.$route.query.styleNames + "款式型号管理";
console.log("**********传递到此层的id：" + this.id);
this.loadRouteType = true;
}
diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue b/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
index cfab3d98..6ff9aa3e 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
@@ -1,6 +1,6 @@
- {{biaoTi}}
+ {{biaoTi}}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularCompentController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularCompentController.java
index 0d30dce4..a01b0c43 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularCompentController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularCompentController.java
@@ -16,6 +16,7 @@ import org.jeecg.modules.demo.base.mapper.ZyClothsModularCompentMapper;
import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
import org.jeecg.modules.demo.base.service.IZyClothsModularCompentService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -63,13 +64,14 @@ public class ZyClothsModularCompentController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyClothsModularCompent, req.getParameterMap());
- queryWrapper.eq("modular_id", modularId);
+ queryWrapper.eq(StringUtils.hasText(modularId),"modular_id", modularId);
+ //queryWrapper.eq("modular_id", modularId);
Page page = new Page(pageNo, pageSize);
IPage pageList = zyClothsModularCompentService.page(page, queryWrapper);
- List recordList = zyClothsModularCompentMapper.queryList(modularId);
- pageList.setRecords(recordList);
+ //List recordList = zyClothsModularCompentMapper.queryList(modularId);
+ //pageList.setRecords(recordList);
List records = pageList.getRecords();
//Pattern pattern = Pattern.compile("-?[0-9]+(\\.[0-9]+)?");
//只要数字 如果是纯数字 就把它替换了
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 45777887..0206f6c9 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
@@ -88,8 +88,8 @@ public class ZyClothsTypeController extends JeecgController 10) {
- return Result.error("类型名称长度不能超过10");
+ if (typeName.length() > 50) {
+ return Result.error("类型名称长度不能超过50");
}
//类型名称 同类型下不重复
if (!StringUtils.isEmpty(zyClothsType.getTypeId())) {
@@ -197,12 +197,17 @@ public class ZyClothsTypeController extends JeecgController weiyi() {
- String a=zyClothsTypeService.sort();
+ public Result weiyi(@RequestParam(name = "id", required = true) String enterpriseId) {
+ if(StringUtils.isEmpty(enterpriseId)){
+ return Result.error("请先选择一个企业");
+ }
+ String a=zyClothsTypeService.sort(enterpriseId);
if(a==null){
return Result.OK("0");
}
- return Result.OK(a.substring(4));
+ //a.substring(4)截掉前4位
+ //return Result.OK(a.substring(4));
+ return Result.OK(a);
}
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 8087e4bf..ee51cca1 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
@@ -21,12 +21,15 @@ public interface ZyClothsTypeMapper extends BaseMapper {
@Select("select nums from zy_cloths_type where nums like 'QIYE%' order by nums desc limit 0,1 ")
String sort();
+ @Select("select nums from zy_cloths_type where order by nums desc limit 0,1 ")
+ String sortTime();
/**根据部门id拿到部门名称*/
String getEnterprisenameById(String enterpriseId);
/**根据部门名称拿到部门id*/
String getEnterpriseName(String enterpriseName);
+ /**计数*/
void setEnterpriseId(String id);
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 3aa9e40c..1526ca47 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
@@ -14,7 +14,10 @@ public interface IZyClothsTypeService extends IService {
/**nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）*/
String generateNumber();
- String sort();
+ String sort(String enterpriseId);
+
+ /**根据企业名称拿到企业编号*/
+ String getEnterpriseNums(String enterpriseName);
void chuliBianHaoWenti();
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
index 8c747e5e..bf8bd43f 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
@@ -46,8 +46,47 @@ public class ZyClothsTypeServiceImpl extends ServiceImpl detail(@RequestParam(name = "id", required = true) String id) {
- System.out.println("服装款式详情 /detail controller层接受到的id: styleId: "+id);
+ //System.out.println("服装款式详情 /detail controller层接受到的id: styleId: "+id);
AllClothStyle allClothStyle = zyClothsStyleService.queryDetail(id);
return Result.OK(allClothStyle);
}
@@ -198,6 +171,21 @@ public class ZyClothsStyleController extends JeecgController enterpriseNum(@RequestParam(name = "id", required = true) String id) {
+ //id.contains(",") 判断是否字符中是否包含","
+ if (id.contains(",")) {
+ return Result.error("只能选择一个企业");
+ } else {
+ String sort = zyClothsStyleService.enterpriseNum(id);
+ //System.err.println(sort + " enterpriseNum");
+ if (StringUtils.isEmpty(sort)) {
+ return Result.OK(0);
+ }
+ return Result.OK(sort);
+ }
+ }
+
/**
* getAction的url sort 编码
*/
@@ -206,7 +194,7 @@ public class ZyClothsStyleController extends JeecgController sort(@RequestParam(name = "id", required = true) String id) {
String sort = zyClothsStyleService.sort(id);
- System.err.println(sort+ " sort");
+ //System.err.println(sort+ " sort");
if (StringUtils.isEmpty(sort)) {
return Result.OK(0);
}
@@ -223,6 +211,9 @@ public class ZyClothsStyleController extends JeecgController edit(@RequestBody ZyClothsStyle zyClothsStyle) {
+ if (StringUtils.isEmpty(zyClothsStyle.getEnterpriseId())){
+ return Result.error("企业不能为空");
+ }
zyClothsStyleService.updateById(zyClothsStyle);
return Result.OK("编辑成功!");
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java
index f5be30b6..67f4ff61 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java
@@ -74,8 +74,8 @@ public class ZyClothsStyle implements Serializable {
@ApiModelProperty(value = "结构")
private String structure;
/**特征*/
- @Excel(name = "特征", width = 15)
- @ApiModelProperty(value = "特征")
+ @Excel(name = "特征 又叫 风格", width = 15)
+ @ApiModelProperty(value = "特征 风格")
private String characteristic;
/**效果*/
@Excel(name = "效果", width = 15)
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/IZyClothsStyleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/IZyClothsStyleService.java
index d288fc75..8fe2fdbb 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/IZyClothsStyleService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/IZyClothsStyleService.java
@@ -23,4 +23,6 @@ public interface IZyClothsStyleService extends IService {
* @param id 根据服装款式id进行查询
*/
AllClothStyle queryDetail(String id);
+
+ String enterpriseNum(String id);
}
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 a755856c..e09dd26a 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
@@ -2,6 +2,7 @@ package org.jeecg.modules.zyclothsstyle.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
import org.jeecg.modules.demo.zyStyleModular.service.IZyStyleModularService;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories;
@@ -44,6 +45,8 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl detail(String id){
ZyClothsStyle zyClothsStyle = zyClothsStyleMapper.selectById(id);
//翻译规格 shape 和企业
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
index cdc9e584..8e854d24 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
@@ -71,19 +71,25 @@ public class ZyStyleModuleController extends JeecgController queryPageList(ZyStyleModule zyStyleModule2, String id,
+ public Result queryPageList(ZyStyleModule zyStyleModule2,
+ @RequestParam(name = "id" )String id,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
System.err.println("ZyStyleModule 款式模块表 传来的 " + id);
- //List listNewStyleModules = new ArrayList<>();
- //QueryWrapper queryWrapper = new QueryWrapper<>();
- List zyStyleModules = zyStyleModuleMapper.getListByStyleId(id);
- List newStyleModuleList = zyStyleModuleService.changeList(zyStyleModules);
- IPage pageList = new Page<>(pageNo, pageSize, newStyleModuleList.size());
- pageList.setRecords(newStyleModuleList);
- return Result.OK(pageList);
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq(StringUtils.hasText(id),"style_id", id);
+ Page page = new Page<>(pageNo, pageSize);
+ IPage pageList = zyStyleModuleService.page(page, queryWrapper);
+ System.out.println(pageList.getRecords());
+
+ //List zyStyleModules = zyStyleModuleMapper.getListByStyleId(id);
+ //改变list中的实体类 类型
+ List newStyleModuleList = zyStyleModuleService.changeList(pageList.getRecords());
+ IPage pageList2 = new Page<>(pageNo, pageSize, newStyleModuleList.size());
+ pageList2.setRecords(newStyleModuleList);
+ return Result.OK(pageList2);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java
index 9d2c64b0..2e2b789a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java
@@ -49,6 +49,9 @@ public class ZyStyleModuleServiceImpl extends ServiceImpl changeList(List zyStyleModules) {
+ if (ObjectUtils.isEmpty(zyStyleModules)){
+ return null;
+ }
List newStyleModuleList = new ArrayList<>();
for (ZyStyleModule zy : zyStyleModules) {
NewStyleModule newSeMo = new NewStyleModule();