生产任务 生产工单

sd-business/src/main/java/com/sd/business/controller/production/ProductionTaskController.java

@@ -0,0 +1,37 @@
+package com.sd.business.controller.production;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.production.dto.ProductionTaskSelectDto;
+import com.sd.business.entity.production.vo.ProductionTaskVo;
+import com.sd.business.service.production.ProductionTaskService;
+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;
+
+
+/**
+ * <p>
+ * 生产任务 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@RestController
+@RequestMapping("/productionTask")
+public class ProductionTaskController {
+
+    @Autowired
+    private ProductionTaskService productionTaskService;
+
+    /**
+     * 生产任务分页
+     */
+    @PostMapping("/page")
+    public Page<ProductionTaskVo> page(@RequestBody ProductionTaskSelectDto dto) {
+        return productionTaskService.getPage(dto);
+    }
+
+}

sd-business/src/main/java/com/sd/business/controller/production/ProductionWorkOrderController.java

@@ -0,0 +1,37 @@
+package com.sd.business.controller.production;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.production.dto.ProductionWorkOrderSelectDto;
+import com.sd.business.entity.production.vo.ProductionWorkOrderVo;
+import com.sd.business.service.production.ProductionWorkOrderService;
+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;
+
+
+/**
+ * <p>
+ * 生产工单 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@RestController
+@RequestMapping("/productionWorkOrder")
+public class ProductionWorkOrderController {
+
+    @Autowired
+    private ProductionWorkOrderService productionWorkOrderService;
+
+    /**
+     * 生产工单分页
+     */
+    @PostMapping("/page")
+    public Page<ProductionWorkOrderVo> page(@RequestBody ProductionWorkOrderSelectDto dto) {
+        return productionWorkOrderService.getPage(dto);
+    }
+
+}

sd-business/src/main/java/com/sd/business/entity/production/dto/ProductionTaskDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.production.dto;
+
+import com.sd.business.entity.production.po.ProductionTask;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产任务新增编辑入参实体
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@Getter
+@Setter
+public class ProductionTaskDto extends ProductionTask {
+
+}

sd-business/src/main/java/com/sd/business/entity/production/dto/ProductionTaskSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.production.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产任务列表查询入参实体
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@Getter
+@Setter
+public class ProductionTaskSelectDto extends BaseSelectDto {
+
+}

sd-business/src/main/java/com/sd/business/entity/production/dto/ProductionWorkOrderDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.production.dto;
+
+import com.sd.business.entity.production.po.ProductionWorkOrder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产工单新增编辑入参实体
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@Getter
+@Setter
+public class ProductionWorkOrderDto extends ProductionWorkOrder {
+
+}

sd-business/src/main/java/com/sd/business/entity/production/dto/ProductionWorkOrderSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.production.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产工单列表查询入参实体
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@Getter
+@Setter
+public class ProductionWorkOrderSelectDto extends BaseSelectDto {
+
+}

sd-business/src/main/java/com/sd/business/entity/production/po/ProductionTask.java

@@ -0,0 +1,64 @@
+package com.sd.business.entity.production.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 生产任务
+ * </p>
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@Getter
+@Setter
+@TableName("production_task")
+public class ProductionTask extends BasePo {
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * sku规格id
+     */
+    private Long skuSpecId;
+
+    /**
+     * bom规格id
+     */
+    private Long bomSpecId;
+
+    /**
+     * 工艺产线id
+     */
+    private Long craftProductionLineId;
+
+    /**
+     * 加工面板 字典:charge_item
+     */
+    private String machinedPanel;
+
+    /**
+     * 生产数量
+     */
+    private BigDecimal productionQuantity;
+
+    /**
+     * 完成数量
+     */
+    private BigDecimal completeQuantity;
+
+    /**
+     * 完成时间
+     */
+    private Date completeTime;
+
+}

sd-business/src/main/java/com/sd/business/entity/production/po/ProductionWorkOrder.java

@@ -0,0 +1,43 @@
+package com.sd.business.entity.production.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 生产工单
+ * </p>
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@Getter
+@Setter
+@TableName("production_work_order")
+public class ProductionWorkOrder extends BasePo {
+
+    /**
+     * 生产任务id
+     */
+    private Long productionTaskId;
+
+    /**
+     * 工单号
+     */
+    private String code;
+
+    /**
+     * 状态 1待投产
+     */
+    private String status;
+
+    /**
+     * 完成时间
+     */
+    private Date completeTime;
+
+}

sd-business/src/main/java/com/sd/business/entity/production/vo/ProductionTaskVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.production.vo;
+
+import com.sd.business.entity.production.po.ProductionTask;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产任务列表查询返回值实体
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@Getter
+@Setter
+public class ProductionTaskVo extends ProductionTask {
+
+}

sd-business/src/main/java/com/sd/business/entity/production/vo/ProductionWorkOrderVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.production.vo;
+
+import com.sd.business.entity.production.po.ProductionWorkOrder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产工单列表查询返回值实体
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@Getter
+@Setter
+public class ProductionWorkOrderVo extends ProductionWorkOrder {
+
+}

sd-business/src/main/java/com/sd/business/mapper/production/ProductionTaskMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.production;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.production.po.ProductionTask;
+import com.sd.business.entity.production.vo.ProductionTaskVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 生产任务 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-07-19
+ */
+public interface ProductionTaskMapper extends BaseMapper<ProductionTask> {
+
+    /**
+     * 生产任务分页
+     */
+    Page<ProductionTaskVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductionTask> wrapper);
+
+}

sd-business/src/main/java/com/sd/business/mapper/production/ProductionWorkOrderMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.production;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.production.po.ProductionWorkOrder;
+import com.sd.business.entity.production.vo.ProductionWorkOrderVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 生产工单 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-07-19
+ */
+public interface ProductionWorkOrderMapper extends BaseMapper<ProductionWorkOrder> {
+
+    /**
+     * 生产工单分页
+     */
+    Page<ProductionWorkOrderVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductionWorkOrder> wrapper);
+
+}

sd-business/src/main/java/com/sd/business/service/production/ProductionTaskService.java

@@ -0,0 +1,25 @@
+package com.sd.business.service.production;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.production.dto.ProductionTaskSelectDto;
+import com.sd.business.entity.production.po.ProductionTask;
+import com.sd.business.entity.production.vo.ProductionTaskVo;
+
+
+/**
+ * <p>
+ * 生产任务 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-19
+ */
+public interface ProductionTaskService extends BaseService<ProductionTask> {
+
+    /**
+     * 生产任务分页
+     */
+    Page<ProductionTaskVo> getPage(ProductionTaskSelectDto dto);
+
+}

sd-business/src/main/java/com/sd/business/service/production/ProductionWorkOrderService.java

@@ -0,0 +1,25 @@
+package com.sd.business.service.production;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.production.dto.ProductionWorkOrderSelectDto;
+import com.sd.business.entity.production.po.ProductionWorkOrder;
+import com.sd.business.entity.production.vo.ProductionWorkOrderVo;
+
+
+/**
+ * <p>
+ * 生产工单 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-19
+ */
+public interface ProductionWorkOrderService extends BaseService<ProductionWorkOrder> {
+
+    /**
+     * 生产工单分页
+     */
+    Page<ProductionWorkOrderVo> getPage(ProductionWorkOrderSelectDto dto);
+
+}

sd-business/src/main/java/com/sd/business/service/production/impl/ProductionTaskServiceImpl.java

@@ -0,0 +1,33 @@
+package com.sd.business.service.production.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.production.dto.ProductionTaskSelectDto;
+import com.sd.business.entity.production.po.ProductionTask;
+import com.sd.business.entity.production.vo.ProductionTaskVo;
+import com.sd.business.mapper.production.ProductionTaskMapper;
+import com.sd.business.service.production.ProductionTaskService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 生产任务 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@Service
+public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper, ProductionTask> implements ProductionTaskService {
+
+    @Override
+    public Page<ProductionTaskVo> getPage(ProductionTaskSelectDto dto) {
+        IWrapper<ProductionTask> wrapper = getWrapper();
+        wrapper.orderByDesc("pt", ProductionTask::getId);
+        Page<ProductionTaskVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+}

sd-business/src/main/java/com/sd/business/service/production/impl/ProductionWorkOrderServiceImpl.java

@@ -0,0 +1,33 @@
+package com.sd.business.service.production.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.production.dto.ProductionWorkOrderSelectDto;
+import com.sd.business.entity.production.po.ProductionWorkOrder;
+import com.sd.business.entity.production.vo.ProductionWorkOrderVo;
+import com.sd.business.mapper.production.ProductionWorkOrderMapper;
+import com.sd.business.service.production.ProductionWorkOrderService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 生产工单 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-19
+ */
+@Service
+public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOrderMapper, ProductionWorkOrder> implements ProductionWorkOrderService {
+
+    @Override
+    public Page<ProductionWorkOrderVo> getPage(ProductionWorkOrderSelectDto dto) {
+        IWrapper<ProductionWorkOrder> wrapper = getWrapper();
+        wrapper.orderByDesc("pwo", ProductionWorkOrder::getId);
+        Page<ProductionWorkOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+}

sd-business/src/main/resources/mapper/production/ProductionTaskMapper.xml

@@ -0,0 +1,22 @@
+<?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.sd.business.mapper.production.ProductionTaskMapper">
+    <select id="getPage" resultType="com.sd.business.entity.production.vo.ProductionTaskVo">
+        select pt.id,
+               pt.order_id,
+               pt.sku_spec_id,
+               pt.bom_spec_id,
+               pt.craft_production_line_id,
+               pt.machined_panel,
+               pt.production_quantity,
+               pt.complete_quantity,
+               pt.complete_time,
+               pt.create_user,
+               pt.create_time,
+               pt.update_user,
+               pt.update_time
+        from production_task pt
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

sd-business/src/main/resources/mapper/production/ProductionWorkOrderMapper.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.sd.business.mapper.production.ProductionWorkOrderMapper">
+    <select id="getPage" resultType="com.sd.business.entity.production.vo.ProductionWorkOrderVo">
+        select pwo.id,
+               pwo.production_task_id,
+               pwo.code,
+               pwo.status,
+               pwo.complete_time,
+               pwo.create_user,
+               pwo.create_time,
+               pwo.update_user,
+               pwo.update_time
+        from production_work_order pwo
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>