@@ -28,7 +29,7 @@
重置
- {{biaoTi}}
+
@@ -40,6 +41,7 @@
@@ -247,7 +248,7 @@ export default {
this.typeId = this.$route.query.typeId;
this.biaoTi = this.$route.query.styleNames+"款式模块管理";
console.log('********id对应的为款式style_id: ' + this.id);
- //console.log('********biaoTi: ' + this.biaoTi);
+ console.log('********biaoTi: ' + this.biaoTi);
console.log('******typeId此为类型typeId: ' + this.typeId);
this.loadRouteType = true;
}
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
new file mode 100644
index 00000000..bf56eee8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
@@ -0,0 +1,156 @@
+package org.jeecg.modules.productplan.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.productplan.entity.ZyPlanProcess;
+import org.jeecg.modules.productplan.service.IZyPlanProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 生产计划工序
+ * @Author: jeecg-boot
+ * @Date: 2022-12-12
+ * @Version: V1.0
+ */
+@Api(tags = "生产计划工序")
+@RestController
+@RequestMapping("/org.jeecg.modules.productplan/zyPlanProcess")
+@Slf4j
+public class ZyPlanProcessController extends JeecgController {
+ @Autowired
+ private IZyPlanProcessService zyPlanProcessService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param zyPlanProcess
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "生产计划工序-分页列表查询")
+ @ApiOperation(value = "生产计划工序-分页列表查询", notes = "生产计划工序-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result queryPageList(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);
+ IPage pageList = zyPlanProcessService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param zyPlanProcess
+ * @return
+ */
+ @AutoLog(value = "生产计划工序-添加")
+ @ApiOperation(value = "生产计划工序-添加", notes = "生产计划工序-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody ZyPlanProcess zyPlanProcess) {
+ zyPlanProcessService.save(zyPlanProcess);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param zyPlanProcess
+ * @return
+ */
+ @AutoLog(value = "生产计划工序-编辑")
+ @ApiOperation(value = "生产计划工序-编辑", notes = "生产计划工序-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@RequestBody ZyPlanProcess zyPlanProcess) {
+ zyPlanProcessService.updateById(zyPlanProcess);
+ 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) {
+ zyPlanProcessService.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.zyPlanProcessService.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) {
+ ZyPlanProcess zyPlanProcess = zyPlanProcessService.getById(id);
+ if (zyPlanProcess == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(zyPlanProcess);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param zyPlanProcess
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ZyPlanProcess zyPlanProcess) {
+ return super.exportXls(request, zyPlanProcess, ZyPlanProcess.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, ZyPlanProcess.class);
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyProductPlanController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyProductPlanController.java
new file mode 100644
index 00000000..3efb487a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyProductPlanController.java
@@ -0,0 +1,156 @@
+package org.jeecg.modules.productplan.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.productplan.entity.ZyProductPlan;
+import org.jeecg.modules.productplan.service.IZyProductPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 生产计划
+ * @Author: jeecg-boot
+ * @Date: 2022-12-12
+ * @Version: V1.0
+ */
+@Api(tags = "生产计划")
+@RestController
+@RequestMapping("/org.jeecg.modules.productplan/zyProductPlan")
+@Slf4j
+public class ZyProductPlanController extends JeecgController {
+ @Autowired
+ private IZyProductPlanService zyProductPlanService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param zyProductPlan
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "生产计划-分页列表查询")
+ @ApiOperation(value = "生产计划-分页列表查询", notes = "生产计划-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result queryPageList(ZyProductPlan zyProductPlan,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProductPlan, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = zyProductPlanService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param zyProductPlan
+ * @return
+ */
+ @AutoLog(value = "生产计划-添加")
+ @ApiOperation(value = "生产计划-添加", notes = "生产计划-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody ZyProductPlan zyProductPlan) {
+ zyProductPlanService.save(zyProductPlan);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param zyProductPlan
+ * @return
+ */
+ @AutoLog(value = "生产计划-编辑")
+ @ApiOperation(value = "生产计划-编辑", notes = "生产计划-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@RequestBody ZyProductPlan zyProductPlan) {
+ zyProductPlanService.updateById(zyProductPlan);
+ 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) {
+ zyProductPlanService.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.zyProductPlanService.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) {
+ ZyProductPlan zyProductPlan = zyProductPlanService.getById(id);
+ if (zyProductPlan == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(zyProductPlan);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param zyProductPlan
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ZyProductPlan zyProductPlan) {
+ return super.exportXls(request, zyProductPlan, ZyProductPlan.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, ZyProductPlan.class);
+ }
+
+}
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
new file mode 100644
index 00000000..36cd67d0
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
@@ -0,0 +1,99 @@
+package org.jeecg.modules.productplan.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 生产计划工序
+ * @Author: jeecg-boot
+ * @Date: 2022-12-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("zy_plan_process")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "zy_plan_process对象", description = "生产计划工序")
+public class ZyPlanProcess 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")
+ private String stationId;
+ /**
+ * 设备id列表
+ */
+ @Excel(name = "设备id列表", width = 15)
+ @ApiModelProperty(value = "设备id列表")
+ private String machineIds;
+ /**
+ * 工具id列表
+ */
+ @Excel(name = "工具id列表", width = 15)
+ @ApiModelProperty(value = "工具id列表")
+ private String toolsIds;
+ /**
+ * 工序id列表
+ */
+ @Excel(name = "工序id列表", width = 15)
+ @ApiModelProperty(value = "工序id列表")
+ private String processIds;
+ /**
+ * 成员id列表
+ */
+ @Excel(name = "成员id列表", width = 15)
+ @ApiModelProperty(value = "成员id列表")
+ private String userIds;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyProductPlan.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyProductPlan.java
new file mode 100644
index 00000000..8382c1fb
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyProductPlan.java
@@ -0,0 +1,137 @@
+package org.jeecg.modules.productplan.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 生产计划
+ * @Author: jeecg-boot
+ * @Date: 2022-12-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("zy_product_plan")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "zy_product_plan对象", description = "生产计划")
+public class ZyProductPlan 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;
+ /**
+ * 工单编号
+ */
+ @Excel(name = "工单编号", width = 15)
+ @ApiModelProperty(value = "工单编号")
+ private String productCode;
+ /**
+ * 车间id
+ */
+ @Excel(name = "车间id", width = 15)
+ @ApiModelProperty(value = "车间id")
+ @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+ private String workshopId;
+ /**
+ * 车间负责人
+ */
+ @Excel(name = "车间负责人", width = 15)
+ @ApiModelProperty(value = "车间负责人")
+ private String responsiblePerson;
+ /**
+ * 班组
+ */
+ @Excel(name = "班组", width = 15)
+ @ApiModelProperty(value = "班组")
+ @Dict(dictTable = "station", dicText = "station_name", dicCode = "id")
+ private String teamId;
+ /**
+ * 组长
+ */
+ @Excel(name = "组长", width = 15)
+ @ApiModelProperty(value = "组长")
+ private String teamLeader;
+ /**
+ * 生产开始时间
+ */
+ @Excel(name = "生产开始时间", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "生产开始时间")
+ private Date workTime;
+ /**
+ * 生产时长
+ */
+ @Excel(name = "生产时长", width = 15)
+ @ApiModelProperty(value = "生产时长")
+ private Integer offTime;
+ /**
+ * 值：未审核0、已审核1、生产中2、已完成3、已撤销8、异常9，默认0
+ */
+ @Excel(name = "状态", width = 15)
+ @Dict(dicCode = "productplanStatus")
+ @ApiModelProperty(value = "状态：未审核0、已审核1、生产中2、已完成3、已撤销8、异常9，默认0")
+ private Integer status;
+ /**
+ * 是否加急
+ */
+ @Excel(name = "是否加急", width = 15)
+ @ApiModelProperty(value = "是否加急")
+ @Dict(dicCode = "sfjj")
+ private Integer speedUp;
+ /**
+ * 审核人
+ */
+ @Excel(name = "审核人", width = 15)
+ @ApiModelProperty(value = "审核人")
+ private String auditBy;
+ /**
+ * 审核时间
+ */
+ @Excel(name = "审核时间", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "审核时间")
+ private Date auditTimr;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanProcessMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanProcessMapper.java
new file mode 100644
index 00000000..8b093d55
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanProcessMapper.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.productplan.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.productplan.entity.ZyPlanProcess;
+
+/**
+ * @Description: 生产计划工序
+ * @Author: jeecg-boot
+ * @Date: 2022-12-12
+ * @Version: V1.0
+ */
+public interface ZyPlanProcessMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyProductPlanMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyProductPlanMapper.java
new file mode 100644
index 00000000..e11589f1
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyProductPlanMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.productplan.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.productplan.entity.ZyProductPlan;
+
+/**
+ * @Description: 生产计划
+ * @Author: jeecg-boot
+ * @Date: 2022-12-12
+ * @Version: V1.0
+ */
+public interface ZyProductPlanMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/xml/ZyPlanProcessMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/xml/ZyPlanProcessMapper.xml
new file mode 100644
index 00000000..97f0c165
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/xml/ZyPlanProcessMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/xml/ZyProductPlanMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/xml/ZyProductPlanMapper.xml
new file mode 100644
index 00000000..cbb33358
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/xml/ZyProductPlanMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
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
new file mode 100644
index 00000000..64b75e44
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.productplan.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.productplan.entity.ZyPlanProcess;
+
+/**
+ * @Description: 生产计划工序
+ * @Author: jeecg-boot
+ * @Date: 2022-12-12
+ * @Version: V1.0
+ */
+public interface IZyPlanProcessService extends IService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyProductPlanService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyProductPlanService.java
new file mode 100644
index 00000000..c8ac6659
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyProductPlanService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.productplan.service;
+
+import org.jeecg.modules.productplan.entity.ZyProductPlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 生产计划
+ * @Author: jeecg-boot
+ * @Date: 2022-12-12
+ * @Version: V1.0
+ */
+public interface IZyProductPlanService extends IService {
+
+}
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
new file mode 100644
index 00000000..fdeeff68
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.productplan.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.productplan.entity.ZyPlanProcess;
+import org.jeecg.modules.productplan.mapper.ZyPlanProcessMapper;
+import org.jeecg.modules.productplan.service.IZyPlanProcessService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 生产计划工序
+ * @Author: jeecg-boot
+ * @Date: 2022-12-12
+ * @Version: V1.0
+ */
+@Service
+public class ZyPlanProcessServiceImpl extends ServiceImpl implements IZyPlanProcessService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java
new file mode 100644
index 00000000..2d9d21e5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.productplan.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.productplan.entity.ZyProductPlan;
+import org.jeecg.modules.productplan.mapper.ZyProductPlanMapper;
+import org.jeecg.modules.productplan.service.IZyProductPlanService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 生产计划
+ * @Author: jeecg-boot
+ * @Date: 2022-12-12
+ * @Version: V1.0
+ */
+@Service
+public class ZyProductPlanServiceImpl extends ServiceImpl implements IZyProductPlanService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxMemberController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxMemberController.java
index 4cf24112..e93f65c6 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxMemberController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxMemberController.java
@@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.team.entity.GroupxMember;
+import org.jeecg.modules.team.entity.GroupxMember;
import org.jeecg.modules.team.service.IGroupxMemberService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -19,6 +22,8 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
/**
* @Description: 班组成员管理
@@ -67,6 +72,26 @@ public class GroupxMemberController extends JeecgController addBatch(@RequestBody GroupxMember en) {
+ String userIds = en.getUserId();
+ List addList = new LinkedList<>();
+ if (StringUtils.isNotBlank(userIds)) {
+ List list = Arrays.asList(userIds.split(","));
+ list.forEach(e -> {
+ GroupxMember s = new GroupxMember();
+ BeanUtils.copyProperties(en, s);
+ s.setUserId(e);
+ addList.add(s);
+ });
+ }
+ groupxMemberService.saveBatch(addList);
+ return Result.OK("添加成功！");
+ }
+
/**
* 编辑
*
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationMachineController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationMachineController.java
index f98a612c..82e32765 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationMachineController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationMachineController.java
@@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.team.entity.StationMachine;
+import org.jeecg.modules.team.entity.StationMachine;
import org.jeecg.modules.team.service.IStationMachineService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -19,6 +22,8 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
/**
* @Description: 工序设备管理
@@ -70,6 +75,25 @@ public class StationMachineController extends JeecgController addBatch(@RequestBody StationMachine en) {
+ String machineIds = en.getMachineId();
+ List addList = new LinkedList<>();
+ if (StringUtils.isNotBlank(machineIds)) {
+ List list = Arrays.asList(machineIds.split(","));
+ list.forEach(e -> {
+ StationMachine s = new StationMachine();
+ BeanUtils.copyProperties(en, s);
+ s.setMachineId(e);
+ addList.add(s);
+ });
+ }
+ stationMachineService.saveBatch(addList);
+ return Result.OK("添加成功！");
+ }
+
/**
* 编辑
*
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java
index f53ac6ef..88c0df6b 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java
@@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.list.SynchronizedList;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.team.entity.StationTool;
import org.jeecg.modules.team.service.IStationToolService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -19,6 +22,9 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @Description: 工序工具管理
@@ -70,6 +76,25 @@ public class StationToolController extends JeecgController addBatch(@RequestBody StationTool stationTool) {
+ String toolsIds = stationTool.getToolsId();
+ List addList = new LinkedList<>();
+ if (StringUtils.isNotBlank(toolsIds)) {
+ List list = Arrays.asList(toolsIds.split(","));
+ list.forEach(e -> {
+ StationTool s = new StationTool();
+ BeanUtils.copyProperties(stationTool, s);
+ s.setToolsId(e);
+ addList.add(s);
+ });
+ }
+ stationToolService.saveBatch(addList);
+ return Result.OK("添加成功！");
+ }
+
/**
* 编辑
*
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java
index a72a19cf..4fcffeae 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -34,6 +35,7 @@ public class Groupx {
/**部门id*/
@Excel(name = "部门id", width = 15)
@ApiModelProperty(value = "部门id")
+ @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private String departId;
/**班组名称*/
@Excel(name = "班组名称", width = 15)
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java
index 06e19fef..37bb7708 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -44,6 +45,7 @@ public class StationMachine {
*/
@Excel(name = "设备id，uuid，FK，设备表", width = 15)
@ApiModelProperty(value = "设备id，uuid，FK，设备表")
+ @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
private String machineId;
/**
* 创建日期
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
index 8f8231f1..2e93af62 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -44,6 +45,7 @@ public class StationTool {
*/
@Excel(name = "工具id，uuid，FK，工具表", width = 15)
@ApiModelProperty(value = "工具id，uuid，FK，工具表")
+ @Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id")
private String toolsId;
/**
* 创建日期