diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue
new file mode 100644
index 00000000..1fd32872
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanFabricDataList.vue
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+ 删除
+
+
+
+
+
+
+
新增
+
导出
+
+
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 制定计划面料
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.userId }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+ 批量操作
+
+
+
+
款式详情
-
-
+ 款式详情
+
+
- 管理模块
-
-
+ 管理模块
+
+
- 管理面料
-
+ 管理面料
+
-
+
- 管理辅料
-
+ 管理辅料
+
-
+
- 管理型号
-
+ 管理型号
+
-
+
- 管理工序
-
+ 管理工序
+
-
+
+ handleCancel(e) {
+ this.visible = false;
+ },
+ },
+}
+
\ No newline at end of file
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 9e543fb6..1467a7ff 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
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.zyStyleModular.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,4 +17,12 @@ public interface ZyStyleModularMapper extends BaseMapper {
List selectListByStyleId(String styleId);
+ /**根据styleId 拿到 款式名称*/
+ @Select("select style_names from zy_cloths_style where id = #{styleId}")
+ String getStyleNameByStyleId(String styleId);
+
+ /**根据工序id 拿到 工序名称*/
+ @Select("select process_name from zy_process where id = #{processId}")
+ String getProcessNameByStyleId(String processId);
+
}
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java
index ad3d6e47..de9abb09 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java
@@ -13,7 +13,7 @@ import java.util.List;
/**
* @Description: 款式工序表
* @Author: jeecg-boot
- * @Date: 2022-11-14
+ * @Date: 2022-11-14
* @Version: V1.0
*/
@Service
@@ -25,6 +25,12 @@ public class ZyStyleModularServiceImpl extends ServiceImpl detail(String id) {
List list = zyStyleModularMapper.selectListByStyleId(id);
+ for (ZyStyleModular zy : list) {
+ String styleName = zyStyleModularMapper.getStyleNameByStyleId(zy.getStyleId());
+ zy.setStyleId(styleName);
+ String processName = zyStyleModularMapper.getProcessNameByStyleId(zy.getProcessId());
+ zy.setProcessId(processName);
+ }
return list;
}
}
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 2f8794bf..e16c9f5e 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
@@ -92,6 +92,10 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl {
+ @Autowired
+ private IZyPlanFabricService zyPlanFabricService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param zyPlanFabric
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "计划面料表-分页列表查询")
+ @ApiOperation(value = "计划面料表-分页列表查询", notes = "计划面料表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result queryPageList(ZyPlanFabric zyPlanFabric, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyPlanFabric, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = zyPlanFabricService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param zyPlanFabric
+ * @return
+ */
+ @AutoLog(value = "计划面料表-添加")
+ @ApiOperation(value = "计划面料表-添加", notes = "计划面料表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody ZyPlanFabric zyPlanFabric) {
+ zyPlanFabricService.save(zyPlanFabric);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param zyPlanFabric
+ * @return
+ */
+ @AutoLog(value = "计划面料表-编辑")
+ @ApiOperation(value = "计划面料表-编辑", notes = "计划面料表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@RequestBody ZyPlanFabric zyPlanFabric) {
+ zyPlanFabricService.updateById(zyPlanFabric);
+ 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) {
+ zyPlanFabricService.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.zyPlanFabricService.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) {
+ ZyPlanFabric zyPlanFabric = zyPlanFabricService.getById(id);
+ if (zyPlanFabric == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(zyPlanFabric);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param zyPlanFabric
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ZyPlanFabric zyPlanFabric) {
+ return super.exportXls(request, zyPlanFabric, ZyPlanFabric.class, "计划面料表");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, ZyPlanFabric.class);
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
index b26835f3..89a695e8 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
@@ -1,7 +1,10 @@
package org.jeecg.modules.productplan.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.PageList;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,11 +13,14 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.productplan.entity.ZyPlanProcess;
import org.jeecg.modules.productplan.entity.vo.ProcessDataVo;
import org.jeecg.modules.productplan.service.IZyPlanProcessService;
+import org.jeecg.modules.team.entity.GroupxMember;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,9 +28,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @Description: 生产计划工序
@@ -111,6 +115,33 @@ public class ZyPlanProcessController extends JeecgController getTeamDatalist(ZyPlanProcess zyPlanProcess,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyPlanProcess, req.getParameterMap());
+// Page page = new Page(pageNo, pageSize);
+ List processDatalist = zyPlanProcessService.getTeamDatalist(zyPlanProcess);
+// PageList processDataVos = new PageList<>(processDatalist, processDatalist.size());
+
+ return Result.OK(processDatalist);
+ }
+
+ @ApiOperation(value = "计划班组管理-查询产品工序&班组", notes = "计划班组管理-查询产品工序&班组")
+ @GetMapping(value = "/getTeamDatalistByPlanId")
+ public Result getTeamDatalistByPlanId(ZyPlanProcess zyPlanProcess,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyPlanProcess, req.getParameterMap());
+ queryWrapper.eq("plan_id", zyPlanProcess.getPlanId());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = zyPlanProcessService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
/**
* 添加
*
@@ -125,6 +156,29 @@ public class ZyPlanProcessController extends JeecgController addProcessBatch(@RequestBody List zyPlanProcessList) {
+
+ zyPlanProcessService.saveBatch(zyPlanProcessList);
+ return Result.OK("添加成功！");
+ }
+
+ // @AutoLog(value = "计划班组管理-批量添加成员")
+ @ApiOperation(value = "计划班组管理-批量添zyPlanProcessList = {ArrayList@21228} size = 7加工序-班组成员", notes = "批量添加工序-班组成员")
+ @PostMapping(value = "/addTeamBatch")
+ public Result addTeamBatch(@RequestBody List zyPlanProcessList) {
+ if (!ObjectUtils.isEmpty(zyPlanProcessList)) {
+ zyPlanProcessList.forEach(e -> {
+ zyPlanProcessService.update(new LambdaUpdateWrapper()
+ .set(ZyPlanProcess::getUserIds, e.getUserIds())
+ .eq(ZyPlanProcess::getProcessId, e.getProcessId()));
+ });
+ }
+ return Result.OK("添加成功！");
+ }
+
/**
* 编辑
*
@@ -145,7 +199,6 @@ public class ZyPlanProcessController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) {
@@ -159,11 +212,19 @@ public class ZyPlanProcessController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- this.zyPlanProcessService.removeByIds(Arrays.asList(ids.split(",")));
+ List zyPlanProcessList = zyPlanProcessService.list(new LambdaQueryWrapper().in(ZyPlanProcess::getId, Arrays.asList(ids.split(","))));
+ if (ObjectUtils.isEmpty(zyPlanProcessList)) throw new JeecgBootException("计划工序数据异常");
+ List updateList = new LinkedList<>();
+ zyPlanProcessList.forEach(e -> {
+ ZyPlanProcess en = new ZyPlanProcess();
+ BeanUtils.copyProperties(e, en);
+ en.setUserIds("");
+ updateList.add(en);
+ });
+ zyPlanProcessService.updateBatchById(updateList);
return Result.OK("批量删除成功!");
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java
new file mode 100644
index 00000000..cc008a9f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java
@@ -0,0 +1,85 @@
+package org.jeecg.modules.productplan.entity;
+
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 计划面料表
+ * @Author: jeecg-boot
+ * @Date: 2022-12-20
+ * @Version: V1.0
+ */
+@Data
+@TableName("zy_plan_fabric")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "zy_plan_fabric对象", description = "计划面料表")
+public class ZyPlanFabric implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**
+ * 创建日期
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**
+ * 更新日期
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+ /**
+ * 计划id
+ */
+ @Excel(name = "计划id", width = 15)
+ @ApiModelProperty(value = "计划id")
+ private String planId;
+ /**
+ * 面料id
+ */
+ @Excel(name = "面料id", width = 15)
+ @ApiModelProperty(value = "面料id")
+ @Dict(dictTable = "zy_fabric", dicText = "name", dicCode = "id")
+ private String fabricId;
+ /**
+ * 用量（合计）
+ */
+ @Excel(name = "用量（合计）", width = 15)
+ @ApiModelProperty(value = "用量（合计）")
+ private BigDecimal amount;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
index ae3b5c27..b286ca1d 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
@@ -100,6 +100,6 @@ public class ZyPlanProcess implements Serializable {
*/
@Excel(name = "成员id列表", width = 15)
@ApiModelProperty(value = "成员id列表")
-// @Dict(dictTable = "sys_user", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "groupx_member", dicText = "user_id", dicCode = "id")
private String userIds;
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java
index 596a69f1..84475544 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java
@@ -4,6 +4,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.team.entity.GroupxMember;
import org.jeecg.modules.team.entity.Station;
import java.io.Serializable;
@@ -16,6 +17,7 @@ public class ProcessDataVo implements Serializable {
private static final long serialVersionUID = 1009888L;
+ private String id;
//工单id
private String workOrderId;
@@ -31,6 +33,9 @@ public class ProcessDataVo implements Serializable {
//工位
private List stationList;
+ //班组成员列表
+ private List groupMemberList;
+
//产品工序id
// @Dict(dictTable ="zy_process",dicText = "process_name",dicCode = "id")
private String productProcessId;
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanFabricMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanFabricMapper.java
new file mode 100644
index 00000000..ce6cda6f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanFabricMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.productplan.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.productplan.entity.ZyPlanFabric;
+
+/**
+ * @Description: 计划面料表
+ * @Author: jeecg-boot
+ * @Date: 2022-12-20
+ * @Version: V1.0
+ */
+public interface ZyPlanFabricMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanFabricService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanFabricService.java
new file mode 100644
index 00000000..9fe7ec46
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanFabricService.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.productplan.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.productplan.entity.ZyPlanFabric;
+
+/**
+ * @Description: 计划面料表
+ * @Author: jeecg-boot
+ * @Date: 2022-12-20
+ * @Version: V1.0
+ */
+public interface IZyPlanFabricService extends IService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
index 804cca26..7a20f520 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
@@ -16,4 +16,6 @@ import java.util.List;
public interface IZyPlanProcessService extends IService {
List getProcessDatalist(ZyPlanProcess zyPlanProcess);
+
+ List getTeamDatalist(ZyPlanProcess zyPlanProcess);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanFabricServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanFabricServiceImpl.java
new file mode 100644
index 00000000..066d3c83
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanFabricServiceImpl.java
@@ -0,0 +1,20 @@
+package org.jeecg.modules.productplan.service.impl;
+
+
+import org.jeecg.modules.productplan.entity.ZyPlanFabric;
+import org.jeecg.modules.productplan.mapper.ZyPlanFabricMapper;
+import org.jeecg.modules.productplan.service.IZyPlanFabricService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 计划面料表
+ * @Author: jeecg-boot
+ * @Date: 2022-12-20
+ * @Version: V1.0
+ */
+@Service
+public class ZyPlanFabricServiceImpl extends ServiceImpl implements IZyPlanFabricService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
index ee9ddff8..d6a579da 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
@@ -16,7 +16,9 @@ import org.jeecg.modules.productplan.service.IZyPlanProcessService;
import org.jeecg.modules.productplan.service.IZyProductPlanService;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.team.entity.GroupxMember;
import org.jeecg.modules.team.entity.Station;
+import org.jeecg.modules.team.service.IGroupxMemberService;
import org.jeecg.modules.team.service.IStationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -48,6 +50,8 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl getProcessDatalist(ZyPlanProcess zyPlanProcess) {
@@ -83,4 +87,41 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl getTeamDatalist(ZyPlanProcess zyPlanProcess) {
+ //生产计划id
+ String planId = zyPlanProcess.getPlanId();
+ ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
+ if (ObjectUtils.isEmpty(zyPlanProcess)) {
+ throw new JeecgBootException("生产计划不存在!");
+ }
+ //工单id
+ String productCode = zyProductPlan.getProductCode();
+ String departId = zyProductPlan.getWorkshopId();
+ // TODO zy_product产品表，根据工单id获取产品id,
+ List result = new LinkedList<>();
+ //根据产品id获取产品工序列表
+// List productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper().eq(ZyProductProcess::getProductId, "产品id"));
+ List productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper().eq(ZyProductProcess::getProductId, "1"));
+ if (!ObjectUtils.isEmpty(productProcessesList)) {
+ SysDepart depart = iSysDepartService.getById(departId);
+ List groupxMemberList = iGroupxMemberService.list(new LambdaQueryWrapper().eq(GroupxMember::getGroupxId, zyProductPlan.getTeamId()));
+ productProcessesList.forEach(e -> {
+ ProcessDataVo vo = new ProcessDataVo();
+// vo.setId()
+ vo.setProductProcessId(e.getProcessId());
+ vo.setProcessName(iZyProcessService.getById(e.getProcessId()).getProcessName());
+ vo.setProductId(e.getProductId());
+// vo.setProductName("产品名称")
+ vo.setWorkOrderId(productCode);
+ vo.setDepartId(departId);
+ vo.setDepartName(depart.getDepartName());
+// vo.setStationList(stationList);
+ vo.setGroupMemberList(groupxMemberList);
+ result.add(vo);
+ });
+ }
+ return result;
+ }
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/vo/AllClothStyle.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/vo/AllClothStyle.java
index 0a7b58d7..12d7d5bf 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/vo/AllClothStyle.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/vo/AllClothStyle.java
@@ -5,6 +5,7 @@ import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric;
+import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import java.util.List;
@@ -12,7 +13,7 @@ import java.util.List;
@Data
public class AllClothStyle {
/**服装款式*/
- private ZyClothsStyle zyClothsStyle;
+ private List zyClothsStyles;
/**子模块 款式模块*/
private List zyStyleModuleList;
/**子模块 款式面料*/
@@ -20,6 +21,7 @@ public class AllClothStyle {
/**子模块 款式辅料*/
private List zyStyleAccessoriesList;
/*子模块 款式型号 因风格问题 暂不开发*/
+ private List zyStyleModels;
/**子模块 款式工序*/
private List zyStyleModularList;
}
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 2a652006..29f84f44 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
@@ -12,6 +12,8 @@ import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper;
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric;
import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService;
+import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
+import org.jeecg.modules.zystylemodel.service.IZyStyleModelService;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,8 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl zyClothsStyles = detail(id);
+ zyAllClothStyle.setZyClothsStyles(zyClothsStyles);
//服装 款式 模块详情
List zyStyleModuleList = zyStyleModuleService.detail(id);
zyAllClothStyle.setZyStyleModuleList(zyStyleModuleList);
@@ -64,7 +68,9 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl zyStyleAccessoriesList = zyStyleAccessoriesService.detail(id);
zyAllClothStyle.setZyStyleAccessoriesList(zyStyleAccessoriesList);
-
+ //服装 款式型号
+ List zyStyleModels = zyStyleModelService.detail(id);
+ zyAllClothStyle.setZyStyleModels(zyStyleModels);
//服装 工序详情
List zyStyleModularList = zyStyleModularService.detail(id);
zyAllClothStyle.setZyStyleModularList(zyStyleModularList);
@@ -72,7 +78,7 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl detail(String id){
ZyClothsStyle zyClothsStyle = zyClothsStyleMapper.selectById(id);
//翻译规格 shape 和企业
String shape = zyClothsStyle.getShape();
@@ -90,7 +96,9 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl zyClothsStyles = new ArrayList<>();
+ zyClothsStyles.add(zyClothsStyle);
+ return zyClothsStyles;
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java
index f6beee5d..fdc219d1 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java
@@ -25,4 +25,12 @@ public interface ZyStyleFabricMapper extends BaseMapper {
@Select("SELECT * FROM zy_style_fabric WHERE style_id = #{id}")
List listByStyleId(String id);
+
+ /**根据styleId 拿到 款式名称*/
+ @Select("select style_names from zy_cloths_style where id = #{styleId}")
+ String getStyleNameByStyleId(String styleId);
+
+ /**根据styleId 拿到 面料名称*/
+ @Select("select contents from zy_accessories where id = #{styleId}")
+ String getAccessoriesNameByStyleId(String styleId);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/entity/ZyStyleModel.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/entity/ZyStyleModel.java
index 23ccf1f3..118a72bb 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/entity/ZyStyleModel.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/entity/ZyStyleModel.java
@@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -44,6 +45,11 @@ public class ZyStyleModel implements Serializable {
@Excel(name = "是否默认尺码", width = 15)
@ApiModelProperty(value = "是否默认尺码")
private java.lang.Integer isdefault;
+
+ /**是否默认尺码*/
+ @TableField(exist = false)
+ private String isDefaultSize;
+
/**型号编码*/
@Excel(name = "型号编码", width = 15)
@ApiModelProperty(value = "型号编码")
@@ -97,4 +103,6 @@ public class ZyStyleModel implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建时间")
private java.util.Date createTime;
+
+
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/mapper/ZyStyleModelMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/mapper/ZyStyleModelMapper.java
index e5b31c76..419dc914 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/mapper/ZyStyleModelMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/mapper/ZyStyleModelMapper.java
@@ -4,6 +4,7 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
/**
@@ -14,4 +15,6 @@ import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
*/
public interface ZyStyleModelMapper extends BaseMapper {
+ @Select("SELECT * FROM zy_style_model WHERE style_id = #{id}")
+ List listByStyleId(String id);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/IZyStyleModelService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/IZyStyleModelService.java
index 1db06253..46fd543e 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/IZyStyleModelService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/IZyStyleModelService.java
@@ -4,6 +4,8 @@ package org.jeecg.modules.zystylemodel.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
+import java.util.List;
+
/**
* @Description: zy_style_model
* @Author: jeecg-boot
@@ -12,4 +14,5 @@ import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
*/
public interface IZyStyleModelService extends IService {
+ List detail(String id);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/impl/ZyStyleModelServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/impl/ZyStyleModelServiceImpl.java
index 8f45e86e..b4861c64 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/impl/ZyStyleModelServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/impl/ZyStyleModelServiceImpl.java
@@ -2,19 +2,50 @@ package org.jeecg.modules.zystylemodel.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
import org.jeecg.modules.zystylemodel.mapper.ZyStyleModelMapper;
import org.jeecg.modules.zystylemodel.service.IZyStyleModelService;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* @Description: zy_style_model
* @Author: jeecg-boot
- * @Date: 2022-09-17
+ * @Date: 2022-09-17
* @Version: V1.0
*/
@Service
public class ZyStyleModelServiceImpl extends ServiceImpl implements IZyStyleModelService {
+ @Resource
+ private ZyStyleModelMapper zyStyleModelMapper;
+ @Resource
+ private ZyStyleFabricMapper zyStyleFabricMapper;
+
+ @Override
+ public List detail(String id) {
+ List zyStyleModels = zyStyleModelMapper.listByStyleId(id);
+ for (ZyStyleModel zy : zyStyleModels) {
+ String styleName = zyStyleFabricMapper.getStyleNameByStyleId(zy.getStyleId());
+ if (StringUtils.hasText(styleName)) {
+ zy.setStyleId(styleName);
+ } else {
+ zy.setStyleId(null);
+ }
+ Integer isDefault = zy.getIsdefault();
+ if (isDefault == 0) {
+ zy.setIsDefaultSize("否");
+ } else if (isDefault == 1) {
+ zy.setIsDefaultSize("是");
+ } else {
+ zy.setIsDefaultSize(null);
+ }
+ }
+ return zyStyleModels;
+ }
}