From 6e6a74bb3c68ad2f7c562132efdc2c06685c30da Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Mon, 12 Dec 2022 14:29:22 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=2012.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/productplan/ZyProductPlanList.vue | 249 ++++++++++++++++++ .../productplan/modules/ZyProductPlanForm.vue | 178 +++++++++++++ .../modules/ZyProductPlanModal.vue | 60 +++++ .../ZyProductPlanModal__Style#Drawer.vue | 84 ++++++ .../controller/ZyProductPlanController.java | 156 +++++++++++ .../productplan/entity/ZyProductPlan.java | 135 ++++++++++ .../mapper/ZyProductPlanMapper.java | 14 + .../mapper/xml/ZyProductPlanMapper.xml | 5 + .../service/IZyProductPlanService.java | 14 + .../impl/ZyProductPlanServiceImpl.java | 18 ++ 10 files changed, 913 insertions(+) create mode 100644 ant-design-vue-jeecg/src/views/productplan/ZyProductPlanList.vue create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanModal.vue create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanModal__Style#Drawer.vue create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyProductPlanController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyProductPlan.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyProductPlanMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/xml/ZyProductPlanMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyProductPlanService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyProductPlanList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyProductPlanList.vue new file mode 100644 index 00000000..4af97af5 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/ZyProductPlanList.vue @@ -0,0 +1,249 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue new file mode 100644 index 00000000..0ee200db --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue @@ -0,0 +1,178 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanModal.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanModal.vue new file mode 100644 index 00000000..453d6b2b --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanModal__Style#Drawer.vue new file mode 100644 index 00000000..511b7ef1 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file 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/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..06898b35 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyProductPlan.java @@ -0,0 +1,135 @@ +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") + private String workshopId; + /** + * 车间负责人 + */ + @Excel(name = "车间负责人", width = 15) + @ApiModelProperty(value = "车间负责人") + private String responsiblePerson; + /** + * 班组 + */ + @Excel(name = "班组", width = 15) + @ApiModelProperty(value = "班组") + 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/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/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/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/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 { + +} From 7a6cb5072fc0c9300c9a495ad703eb5e984504cd Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Mon, 12 Dec 2022 18:00:32 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=B7=A5=E5=BA=8F=E5=8A=9F=E8=83=BD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=2012.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productplan/ZyPlanProcessAddList.vue | 605 ++++++++++++++++++ .../views/productplan/ZyPlanProcessList.vue | 218 +++++++ .../productplan/modules/ZyPlanProcessForm.vue | 126 ++++ .../modules/ZyPlanProcessForm2.vue | 107 ++++ .../modules/ZyPlanProcessModal.vue | 60 ++ .../modules/ZyPlanProcessModal2.vue | 60 ++ .../ZyPlanProcessModal__Style#Drawer.vue | 84 +++ .../productplan/modules/ZyProductPlanForm.vue | 25 +- .../controller/ZyPlanProcessController.java | 156 +++++ .../productplan/entity/ZyPlanProcess.java | 99 +++ .../mapper/ZyPlanProcessMapper.java | 15 + .../mapper/xml/ZyPlanProcessMapper.xml | 5 + .../service/IZyPlanProcessService.java | 15 + .../impl/ZyPlanProcessServiceImpl.java | 19 + 14 files changed, 1585 insertions(+), 9 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessAddList.vue create mode 100644 ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessForm.vue create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessForm2.vue create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal.vue create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal2.vue create mode 100644 ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal__Style#Drawer.vue create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/ZyPlanProcessMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/mapper/xml/ZyPlanProcessMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessAddList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessAddList.vue new file mode 100644 index 00000000..023955a9 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessAddList.vue @@ -0,0 +1,605 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue new file mode 100644 index 00000000..ea9f98b5 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue @@ -0,0 +1,218 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessForm.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessForm.vue new file mode 100644 index 00000000..2daf2687 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessForm.vue @@ -0,0 +1,126 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessForm2.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessForm2.vue new file mode 100644 index 00000000..e868c539 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessForm2.vue @@ -0,0 +1,107 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal.vue new file mode 100644 index 00000000..512a5b19 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal2.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal2.vue new file mode 100644 index 00000000..31f85dc9 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal2.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal__Style#Drawer.vue new file mode 100644 index 00000000..1a276124 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyPlanProcessModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue index 0ee200db..0702eb76 100644 --- a/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue +++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue @@ -8,7 +8,8 @@ - @@ -30,14 +31,16 @@ + placeholder="请先选择所属车间班组" :dict-code="groupxVal" + :disabled="model.workshopId==null"/> + placeholder="请先选择所属车间班组" :dict-code="groupxVal2" + :disabled="model.workshopId==null"/> @@ -80,13 +83,12 @@ From 255ea96587c1c2974cdcdf75ca50003a8520ec4e Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Tue, 13 Dec 2022 15:15:39 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=2012.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/team/GroupxList.vue | 7 ++++++- .../src/views/team/modules/GroupxModal.vue | 19 +++++++++++++------ .../org/jeecg/modules/team/entity/Groupx.java | 2 ++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/team/GroupxList.vue b/ant-design-vue-jeecg/src/views/team/GroupxList.vue index 1c9b3ccb..3b1e4be3 100644 --- a/ant-design-vue-jeecg/src/views/team/GroupxList.vue +++ b/ant-design-vue-jeecg/src/views/team/GroupxList.vue @@ -6,7 +6,7 @@ - + @@ -145,6 +145,11 @@ export default { align: "center", dataIndex: 'departId' }, + { + title: '部门名称', + align: "center", + dataIndex: 'departId_dictText' + }, { title: '班组名称', align: "center", diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue index da674f00..845aacce 100644 --- a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue +++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue @@ -12,7 +12,7 @@ - + @@ -20,10 +20,12 @@ - + + - + + @@ -46,6 +48,7 @@ export default { return { title: "操作", visible: false, + mobileVal: "", model: {}, labelCol: { xs: {span: 24}, @@ -59,13 +62,13 @@ export default { confirmLoading: false, validatorRules: { departId: [ - {required: true}, + {required: true, message: "部门名称不能为空"}, ], groupName: [ - {required: true}, + {required: true, message: "班组名称不能为空"}, ], enterprisesManager: [ - {required: true}, + {required: true, message: "负责人不能为空"}, ], mobile: [ {required: false}, @@ -82,6 +85,10 @@ export default { created() { }, methods: { + getMobile() { + alert(this.model.enterprisesManager); + this.mobileVal = "sys_user,phone,username,username='" + this.model.enterprisesManager + "'"; + }, add() { //初始化默认值 this.edit({}); 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) From f68f899b69850a8c1d8514cf104d61cb3428fd2a Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Tue, 13 Dec 2022 16:45:48 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=2012.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/team/StationList.vue | 14 +++---- .../src/views/team/modules/GroupxModal.vue | 39 +++++++++++++------ .../src/views/team/modules/StationModal.vue | 6 +-- 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/team/StationList.vue b/ant-design-vue-jeecg/src/views/team/StationList.vue index 9814c0df..90abc0ef 100644 --- a/ant-design-vue-jeecg/src/views/team/StationList.vue +++ b/ant-design-vue-jeecg/src/views/team/StationList.vue @@ -10,7 +10,7 @@ - + @@ -129,25 +129,25 @@ export default { return parseInt(index) + 1; } }, - { + /*{ title: '车间ID', align: "center", dataIndex: 'departId' - }, + },*/ { title: '车间名称', align: "center", dataIndex: 'departName' }, { - title: '工位名称', + title: '工位序号', align: "center", - dataIndex: 'stationName' + dataIndex: 'stationNum' }, { - title: '工位序号', + title: '工位名称', align: "center", - dataIndex: 'stationNum' + dataIndex: 'stationName' }, { title: '备注', diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue index 845aacce..d31a4c4b 100644 --- a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue +++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue @@ -24,8 +24,8 @@ - - + + @@ -34,7 +34,7 @@ + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue b/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue index 54730fc9..4e1ac89e 100644 --- a/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue +++ b/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue @@ -1,44 +1,35 @@ From d5f7eec08c0a0c01f14b49662a8ce0a498b69647 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Wed, 14 Dec 2022 15:35:44 +0800 Subject: [PATCH 09/18] 1 --- ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue | 5 +++++ .../src/views/team/modules/StationToolModal.vue | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue b/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue index ffca9140..f3062ae1 100644 --- a/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue +++ b/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue @@ -180,6 +180,7 @@ }, dictOptions:{}, superFieldList:[], + selectedRowKeys: [], } }, created() { @@ -191,6 +192,10 @@ }, }, methods: { + onSelectChange(selectedRowKeys){ + console.log('selectedRowKeys changed: ', selectedRowKeys); + this.selectedRowKeys = selectedRowKeys; + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue b/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue index 4e1ac89e..6765c475 100644 --- a/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue +++ b/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue @@ -5,7 +5,7 @@ :visible="visible" :confirmLoading="confirmLoading" switchFullscreen - @ok="handleOk2(record)" + @ok="handleOk2" @cancel="handleCancel" cancelText="关闭"> @@ -83,7 +83,9 @@ export default { this.$refs.form.clearValidate(); }, handleOk2(record) { - alert(record); + // alert(record); + // console.log('-----------------------------------------------------------------------') + console.log(this.$refs["modalForm2"].selectedRowKeys) const that = this; // 触发表单验证 // this.$refs.form.validate(valid => { From 83f304ef219e4ef293bd7acd42b5237c540ce4cf Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Wed, 14 Dec 2022 17:03:42 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=2012.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/devicetype/ZyDevicetypeListRef.vue | 285 ++++++++++++++++++ .../team/modules/StationMachineModal.vue | 79 +++-- .../views/team/modules/StationToolModal.vue | 42 +-- .../controller/StationMachineController.java | 24 ++ .../controller/StationToolController.java | 25 ++ 5 files changed, 415 insertions(+), 40 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue diff --git a/ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue b/ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue new file mode 100644 index 00000000..35a2aa70 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue @@ -0,0 +1,285 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/team/modules/StationMachineModal.vue b/ant-design-vue-jeecg/src/views/team/modules/StationMachineModal.vue index 92074975..e2dad99c 100644 --- a/ant-design-vue-jeecg/src/views/team/modules/StationMachineModal.vue +++ b/ant-design-vue-jeecg/src/views/team/modules/StationMachineModal.vue @@ -1,47 +1,53 @@ \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue index 63e178cc..1489a9c3 100644 --- a/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue +++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue @@ -20,9 +20,9 @@ - - - + + + @@ -62,6 +62,7 @@ export default { }, url: { add: "/groupxMember/add", + addBatch: "/groupxMember/addBatch", edit: "/groupxMember/edit", } , @@ -98,25 +99,24 @@ export default { let httpurl = ''; let method = ''; if (!this.model.id) { - httpurl += this.url.add; + httpurl += this.url.addBatch; method = 'post'; } else { httpurl += this.url.edit; method = 'put'; } console.log("----------the add() model:", this.model); - this.model.stationId = - httpAction(httpurl, this.model, method).then((res) => { - if (res.success) { - that.$message.success(res.message); - that.$emit('ok'); - } else { - that.$message.warning(res.message); - } - }).finally(() => { - that.confirmLoading = false; - that.close(); - }) + httpAction(httpurl, this.model, method).then((res) => { + if (res.success) { + that.$message.success(res.message); + that.$emit('ok'); + } else { + that.$message.warning(res.message); + } + }).finally(() => { + that.confirmLoading = false; + that.close(); + }) } else { return false; } diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue index bec6a25a..7d377c1a 100644 --- a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue +++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue @@ -22,15 +22,20 @@ + + - - - + + + - - - {{ model.enterprisesManager }} + + + + + + @@ -44,13 +49,13 @@