@@ -67,7 +78,8 @@
无图片
- ![]()
+ ![]()
无文件
@@ -84,9 +96,9 @@
-
-
-
+
+
+
删除
@@ -101,161 +113,173 @@
\ 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 d9f92020..2c257ab3 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue
@@ -4,11 +4,14 @@
+
+ {{biaoTi}}
+
-
+ 返回
@@ -44,250 +47,261 @@
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue b/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
index aa63a6e9..85f6272a 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
@@ -4,18 +4,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
重置
+ {{biaoTi}}
+
+
新增
导出
+
@@ -53,8 +57,8 @@
返回
-
{
- @Autowired
- private IZyStyleModularService zyStyleModularService;
-
- /**
- * 分页列表查询
- *
- * @param zyStyleModular
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "款式工序表-分页列表查询")
- @ApiOperation(value="款式工序表-分页列表查询", notes="款式工序表-分页列表查询")
- @GetMapping(value = "/list")
- public Result queryPageList(ZyStyleModular zyStyleModular,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyStyleModular, req.getParameterMap());
- Page page = new Page(pageNo, pageSize);
- IPage pageList = zyStyleModularService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
+ @Autowired
+ private IZyStyleModularService zyStyleModularService;
+ @Resource
+ private ZyStyleModularMapper zyStyleModularMapper;
+ /**
+ * 分页列表查询
+ *
+ * @param zyStyleModular
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "款式工序表-分页列表查询")
+ @ApiOperation(value = "款式工序表-分页列表查询", notes = "款式工序表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result queryPageList(ZyStyleModular zyStyleModular, String id,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyStyleModular, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = zyStyleModularService.page(page, queryWrapper);
+ List list = zyStyleModularMapper.selectListByStyleId(id);
+ pageList.setRecords(list);
+ return Result.OK(pageList);
+ }
- /**
- * 添加
- *
- * @param zyStyleModular
- * @return
- */
- @AutoLog(value = "款式工序表-添加")
- @ApiOperation(value="款式工序表-添加", notes="款式工序表-添加")
- @PostMapping(value = "/add")
- public Result add(@RequestBody ZyStyleModular zyStyleModular) {
- String[] split = zyStyleModular.getProcessId().split(",");
- QueryWrapper queryWrapper=new QueryWrapper();
- queryWrapper.eq("style_id",zyStyleModular.getStyleId());
- for (String s : split) {
- zyStyleModular.setProcessId(s);
- zyStyleModular.setId(null);
- queryWrapper.eq("process_id",zyStyleModular.getProcessId());
- int a=zyStyleModularService.count(queryWrapper);
- if(a>=1)
- return Result.error("存在以添加过的数据！！！");
- zyStyleModularService.save(zyStyleModular);
- }
- return Result.OK("添加成功！");
- }
+ /**
+ * 添加
+ *
+ * @param zyStyleModular
+ * @return
+ */
+ @AutoLog(value = "款式工序表-添加")
+ @ApiOperation(value = "款式工序表-添加", notes = "款式工序表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody ZyStyleModular zyStyleModular) {
+ String[] split = zyStyleModular.getProcessId().split(",");
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("style_id", zyStyleModular.getStyleId());
+ for (String s : split) {
+ zyStyleModular.setProcessId(s);
+ zyStyleModular.setId(null);
+ queryWrapper.eq("process_id", zyStyleModular.getProcessId());
+ int a = zyStyleModularService.count(queryWrapper);
+ if (a >= 1)
+ return Result.error("存在以添加过的数据！！！");
+ zyStyleModularService.save(zyStyleModular);
+ }
+ return Result.OK("添加成功！");
+ }
- /**
- * 编辑
- *
- * @param zyStyleModular
- * @return
- */
- @AutoLog(value = "款式工序表-编辑")
- @ApiOperation(value="款式工序表-编辑", notes="款式工序表-编辑")
- @PutMapping(value = "/edit")
- public Result edit(@RequestBody ZyStyleModular zyStyleModular) {
- zyStyleModularService.updateById(zyStyleModular);
- return Result.OK("编辑成功!");
- }
+ /**
+ * 编辑
+ *
+ * @param zyStyleModular
+ * @return
+ */
+ @AutoLog(value = "款式工序表-编辑")
+ @ApiOperation(value = "款式工序表-编辑", notes = "款式工序表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@RequestBody ZyStyleModular zyStyleModular) {
+ zyStyleModularService.updateById(zyStyleModular);
+ return Result.OK("编辑成功!");
+ }
- /**
- * 通过id删除
- *
- * @param id
- * @return
- */
- @AutoLog(value = "款式工序表-通过id删除")
- @ApiOperation(value="款式工序表-通过id删除", notes="款式工序表-通过id删除")
- @DeleteMapping(value = "/delete")
- public Result delete(@RequestParam(name="id",required=true) String id) {
- zyStyleModularService.removeById(id);
- return Result.OK("删除成功!");
- }
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "款式工序表-通过id删除")
+ @ApiOperation(value = "款式工序表-通过id删除", notes = "款式工序表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name = "id", required = true) String id) {
+ zyStyleModularService.removeById(id);
+ return Result.OK("删除成功!");
+ }
- /**
- * 批量删除
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "款式工序表-批量删除")
- @ApiOperation(value="款式工序表-批量删除", notes="款式工序表-批量删除")
- @DeleteMapping(value = "/deleteBatch")
- public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.zyStyleModularService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("批量删除成功!");
- }
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "款式工序表-批量删除")
+ @ApiOperation(value = "款式工序表-批量删除", notes = "款式工序表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.zyStyleModularService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
- /**
- * 通过id查询
- *
- * @param id
- * @return
- */
- @AutoLog(value = "款式工序表-通过id查询")
- @ApiOperation(value="款式工序表-通过id查询", notes="款式工序表-通过id查询")
- @GetMapping(value = "/queryById")
- public Result queryById(@RequestParam(name="id",required=true) String id) {
- ZyStyleModular zyStyleModular = zyStyleModularService.getById(id);
- if(zyStyleModular==null) {
- return Result.error("未找到对应数据");
- }
- return Result.OK(zyStyleModular);
- }
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "款式工序表-通过id查询")
+ @ApiOperation(value = "款式工序表-通过id查询", notes = "款式工序表-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name = "id", required = true) String id) {
+ ZyStyleModular zyStyleModular = zyStyleModularService.getById(id);
+ if (zyStyleModular == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(zyStyleModular);
+ }
/**
- * 导出excel
- *
- * @param request
- * @param zyStyleModular
- */
+ * 导出excel
+ *
+ * @param request
+ * @param zyStyleModular
+ */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ZyStyleModular zyStyleModular) {
return super.exportXls(request, zyStyleModular, ZyStyleModular.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, ZyStyleModular.class);
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 8818cc72..0444a4d0 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
@@ -64,4 +64,9 @@ public class ZyStyleModular implements Serializable {
@ApiModelProperty(value = "工序id")
@Dict(dictTable = "zy_process",dicText = "process_name",dicCode = "id")
private String processId;
+
+ /**序号*/
+ @Excel(name = "序号", width = 15,dicCode = "序号")
+ @ApiModelProperty(value = "序号")
+ private Integer order;
}
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/ZyStyleModularMapper.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/ZyStyleModularMapper.java
index fb4dc6a0..9e543fb6 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/ZyStyleModularMapper.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/ZyStyleModularMapper.java
@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ZyStyleModularMapper extends BaseMapper {
+ List selectListByStyleId(String styleId);
+
}
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/xml/ZyStyleModularMapper.xml b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/xml/ZyStyleModularMapper.xml
index d5e9ff86..af1d4f42 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/xml/ZyStyleModularMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/xml/ZyStyleModularMapper.xml
@@ -2,4 +2,9 @@
+
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 cb4018e2..51098213 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
@@ -103,6 +103,8 @@ public class ZyClothsModularController extends JeecgController add(@RequestBody ZyClothsModular zyClothsModular) {
+ //nums，编号，varchar，18，非空，不重复，编码规则：服装类型（10）+序号（8）
+ zyClothsModular.setNums(zyClothsModularService.generateNumber(zyClothsModular));
zyClothsModularService.save(zyClothsModular);
return Result.OK("添加成功！");
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java
index 09666f52..611e2375 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java
@@ -76,4 +76,5 @@ public class ZyClothsModular implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private java.util.Date updateTime;
+
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsModularMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsModularMapper.java
index 626d703b..0eb2a68f 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsModularMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsModularMapper.java
@@ -15,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface ZyClothsModularMapper extends BaseMapper {
public List selectByType(@Param("cloths_type_id")String cloths_type_id);
+ List selectNumsList1();
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsModularMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsModularMapper.xml
index 9dab77a8..7f71df05 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsModularMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsModularMapper.xml
@@ -2,7 +2,12 @@
+
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsModularService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsModularService.java
index bf000916..5cd86ee6 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsModularService.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsModularService.java
@@ -14,4 +14,6 @@ import java.util.List;
public interface IZyClothsModularService extends IService {
public List selectByType(String cloths_type_id);
+ /**nums，编号，varchar，18，非空，不重复，编码规则：服装类型（10）+序号（8）*/
+ String generateNumber(ZyClothsModular zyClothsModular);
}
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 94c27399..e228e589 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
@@ -8,7 +8,11 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.regex.Pattern;
/**
* @Description: zy_cloths_modular
@@ -18,7 +22,7 @@ import java.util.List;
*/
@Service
public class ZyClothsModularServiceImpl extends ServiceImpl implements IZyClothsModularService {
- @Autowired
+ @Resource
private ZyClothsModularMapper zyClothsModularMapper;
@Override
@@ -26,4 +30,33 @@ public class ZyClothsModularServiceImpl extends ServiceImpl listString = zyClothsModularMapper.selectNumsList1();
+ List listLong = new ArrayList<>();
+ for (String nums : listString) {
+ String REGEX = "[^0-9]";
+ String newNums = Pattern.compile(REGEX).matcher(nums).replaceAll("").trim();
+ 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/pro/entity/ZyProcessComponent.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java
index c73b6955..370dd852 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
@@ -49,6 +49,10 @@ public class ZyProcessComponent implements Serializable {
@Dict(dicCode = "pingjing")
@ApiModelProperty(value = "是否瓶颈工序")
private String bottleneck;
+ /**序号*/
+ @Excel(name = "序号", width = 15,dicCode = "序号")
+ @ApiModelProperty(value = "序号")
+ private Integer order;
/**创建时间*/
@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-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml
index 80eb9603..a9f38d18 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml
@@ -6,7 +6,7 @@
DELETE FROM sys_log
-
+
@@ -100,9 +104,9 @@
-
-
-
+
+
+
删除
@@ -111,7 +115,7 @@
-