瀏覽代碼

添加生产排程

yzc 1 年之前
父節點
當前提交
414019cb7f

+ 63 - 0
hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionSchedulingController.java

@@ -0,0 +1,63 @@
+package com.fjhx.mes.controller.production;
+
+import com.fjhx.mes.entity.production.dto.ProductionSchedulingDto;
+import com.fjhx.mes.entity.production.dto.ProductionSchedulingSelectDto;
+import com.fjhx.mes.entity.production.vo.ProductionSchedulingVo;
+import com.fjhx.mes.service.production.ProductionSchedulingService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 生产排程 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-02-03
+ */
+@RestController
+@RequestMapping("/productionScheduling")
+public class ProductionSchedulingController {
+
+    @Autowired
+    private ProductionSchedulingService productionSchedulingService;
+
+    /**
+     * 生产排程列表
+     */
+    @PostMapping("/list")
+    public List<ProductionSchedulingVo> list(@RequestBody ProductionSchedulingSelectDto dto) {
+        return productionSchedulingService.getList(dto);
+    }
+
+    /**
+     * 生产排程新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ProductionSchedulingDto productionSchedulingDto) {
+        productionSchedulingService.add(productionSchedulingDto);
+    }
+
+    /**
+     * 生产排程编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ProductionSchedulingDto productionSchedulingDto) {
+        productionSchedulingService.edit(productionSchedulingDto);
+    }
+
+    /**
+     * 生产排程删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        productionSchedulingService.delete(dto.getId());
+    }
+
+}

+ 17 - 0
hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProductionSchedulingDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.production.dto;
+
+import com.fjhx.mes.entity.production.po.ProductionScheduling;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产排程新增编辑入参实体
+ *
+ * @author
+ * @since 2024-02-03
+ */
+@Getter
+@Setter
+public class ProductionSchedulingDto extends ProductionScheduling {
+
+}

+ 17 - 0
hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProductionSchedulingSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.production.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产排程列表查询入参实体
+ *
+ * @author
+ * @since 2024-02-03
+ */
+@Getter
+@Setter
+public class ProductionSchedulingSelectDto extends BaseSelectDto {
+
+}

+ 45 - 0
hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionScheduling.java

@@ -0,0 +1,45 @@
+package com.fjhx.mes.entity.production.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 生产排程
+ * </p>
+ *
+ * @author
+ * @since 2024-02-03
+ */
+@Getter
+@Setter
+@TableName("production_scheduling")
+public class ProductionScheduling extends BasePo {
+
+    /**
+     * 任务id
+     */
+    private Long taskId;
+
+    /**
+     * 工序id
+     */
+    private Long processesId;
+
+    /**
+     * 排程时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date schedulingDate;
+
+    /**
+     * 排程数量
+     */
+    private Integer quantity;
+
+}

+ 17 - 0
hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionSchedulingVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.production.vo;
+
+import com.fjhx.mes.entity.production.po.ProductionScheduling;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产排程列表查询返回值实体
+ *
+ * @author
+ * @since 2024-02-03
+ */
+@Getter
+@Setter
+public class ProductionSchedulingVo extends ProductionScheduling {
+
+}

+ 26 - 0
hx-mes/src/main/java/com/fjhx/mes/mapper/production/ProductionSchedulingMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.mes.mapper.production;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.mes.entity.production.po.ProductionScheduling;
+import com.fjhx.mes.entity.production.vo.ProductionSchedulingVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 生产排程 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-02-03
+ */
+public interface ProductionSchedulingMapper extends BaseMapper<ProductionScheduling> {
+
+    /**
+     * 生产排程列表
+     */
+    List<ProductionSchedulingVo> getList(@Param("ew") IWrapper<ProductionScheduling> wrapper);
+
+}

+ 41 - 0
hx-mes/src/main/java/com/fjhx/mes/service/production/ProductionSchedulingService.java

@@ -0,0 +1,41 @@
+package com.fjhx.mes.service.production;
+
+import com.fjhx.mes.entity.production.dto.ProductionSchedulingDto;
+import com.fjhx.mes.entity.production.dto.ProductionSchedulingSelectDto;
+import com.fjhx.mes.entity.production.po.ProductionScheduling;
+import com.fjhx.mes.entity.production.vo.ProductionSchedulingVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 生产排程 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-02-03
+ */
+public interface ProductionSchedulingService extends BaseService<ProductionScheduling> {
+
+    /**
+     * 生产排程列表
+     */
+    List<ProductionSchedulingVo> getList(ProductionSchedulingSelectDto dto);
+
+    /**
+     * 生产排程新增
+     */
+    void add(ProductionSchedulingDto productionSchedulingDto);
+
+    /**
+     * 生产排程编辑
+     */
+    void edit(ProductionSchedulingDto productionSchedulingDto);
+
+    /**
+     * 生产排程删除
+     */
+    void delete(Long id);
+
+}

+ 49 - 0
hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionSchedulingServiceImpl.java

@@ -0,0 +1,49 @@
+package com.fjhx.mes.service.production.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.mes.entity.production.dto.ProductionSchedulingDto;
+import com.fjhx.mes.entity.production.dto.ProductionSchedulingSelectDto;
+import com.fjhx.mes.entity.production.po.ProductionScheduling;
+import com.fjhx.mes.entity.production.vo.ProductionSchedulingVo;
+import com.fjhx.mes.mapper.production.ProductionSchedulingMapper;
+import com.fjhx.mes.service.production.ProductionSchedulingService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 生产排程 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-02-03
+ */
+@Service
+public class ProductionSchedulingServiceImpl extends ServiceImpl<ProductionSchedulingMapper, ProductionScheduling> implements ProductionSchedulingService {
+
+    @Override
+    public List<ProductionSchedulingVo> getList(ProductionSchedulingSelectDto dto) {
+        IWrapper<ProductionScheduling> wrapper = getWrapper();
+        wrapper.orderByDesc("ps", ProductionScheduling::getId);
+        List<ProductionSchedulingVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public void add(ProductionSchedulingDto productionSchedulingDto) {
+        this.save(productionSchedulingDto);
+    }
+
+    @Override
+    public void edit(ProductionSchedulingDto productionSchedulingDto) {
+        this.updateById(productionSchedulingDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 18 - 0
hx-mes/src/main/resources/mapper/production/ProductionSchedulingMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.mes.mapper.production.ProductionSchedulingMapper">
+    <select id="getList" resultType="com.fjhx.mes.entity.production.vo.ProductionSchedulingVo">
+        select ps.id,
+               ps.task_id,
+               ps.processes_id,
+               ps.scheduling_date,
+               ps.quantity,
+               ps.create_user,
+               ps.create_time,
+               ps.update_user,
+               ps.update_time
+        from production_scheduling ps
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>