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 { + +}