完工入库

hx-mes/pom.xml

@@ -31,6 +31,10 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-item</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-wms</artifactId>
+        </dependency>
 
     </dependencies>
 

hx-mes/src/main/java/com/fjhx/mes/controller/completion/CompletionInfoController.java

@@ -0,0 +1,71 @@
+package com.fjhx.mes.controller.completion;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.completion.vo.CompletionInfoVo;
+import com.fjhx.mes.entity.completion.dto.CompletionInfoSelectDto;
+import com.fjhx.mes.entity.completion.dto.CompletionInfoDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.mes.service.completion.CompletionInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 完工入库 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@DS(SourceConstant.MES)
+@RestController
+@RequestMapping("/completionInfo")
+public class CompletionInfoController {
+
+    @Autowired
+    private CompletionInfoService completionInfoService;
+
+    /**
+     * 完工入库分页
+     */
+    @PostMapping("/page")
+    public Page<CompletionInfoVo> page(@RequestBody CompletionInfoSelectDto dto) {
+        return completionInfoService.getPage(dto);
+    }
+
+    /**
+     * 完工入库明细
+     */
+    @PostMapping("/detail")
+    public CompletionInfoVo detail(@RequestBody BaseSelectDto dto) {
+        return completionInfoService.detail(dto.getId());
+    }
+
+    /**
+     * 完工入库新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody CompletionInfoDto completionInfoDto) {
+        completionInfoService.add(completionInfoDto);
+    }
+
+    /**
+     * 完工入库编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody CompletionInfoDto completionInfoDto) {
+        completionInfoService.edit(completionInfoDto);
+    }
+
+    /**
+     * 完工入库删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        completionInfoService.delete(dto.getId());
+    }
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/completion/dto/CompletionInfoDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.completion.dto;
+
+import com.fjhx.mes.entity.completion.po.CompletionInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 完工入库新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+public class CompletionInfoDto extends CompletionInfo {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/completion/dto/CompletionInfoSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.completion.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 完工入库列表查询入参实体
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+public class CompletionInfoSelectDto extends BaseSelectDto {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/completion/po/CompletionInfo.java

@@ -0,0 +1,34 @@
+package com.fjhx.mes.entity.completion.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 完工入库
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+@TableName("completion_info")
+public class CompletionInfo extends BasePo {
+
+    /**
+     * 生产任务id
+     */
+    private Long productionTaskId;
+
+    /**
+     * 完工数量
+     */
+    private BigDecimal quantity;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/completion/vo/CompletionInfoVo.java

@@ -0,0 +1,44 @@
+package com.fjhx.mes.entity.completion.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fjhx.mes.entity.completion.po.CompletionInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 完工入库列表查询返回值实体
+ *
+ * @author
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+public class CompletionInfoVo extends CompletionInfo {
+
+    /**
+     * 产品名
+     */
+    private String productName;
+
+    /**
+     * 生产任务编号
+     */
+    private String productionTaskCode;
+    /**
+     * 生产任务数量
+     */
+    private BigDecimal productionTaskQuantity;
+    /**
+     * 生产任务负责人
+     */
+    private String personLiableName;
+    /**
+     * 生产任务期限
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date productionTaskDueDate;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionPlan.java

@@ -1,5 +1,6 @@
 package com.fjhx.mes.entity.production.po;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
@@ -32,11 +33,13 @@ public class ProductionPlan extends BasePo {
     /**
      * 计划开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
     /**
      * 计划结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date stopDate;
 
     /**

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionTask.java

@@ -1,7 +1,10 @@
 package com.fjhx.mes.entity.production.po;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
@@ -32,7 +35,7 @@ public class ProductionTask extends BasePo {
     /**
      * 任务数量
      */
-    private Long quantity;
+    private BigDecimal quantity;
 
     /**
      * 负责人id
@@ -47,6 +50,7 @@ public class ProductionTask extends BasePo {
     /**
      * 完成期限
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date dueDate;
 
 }

hx-mes/src/main/java/com/fjhx/mes/mapper/completion/CompletionInfoMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.mes.mapper.completion;
+
+import com.fjhx.mes.entity.completion.po.CompletionInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.completion.vo.CompletionInfoVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 完工入库 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+public interface CompletionInfoMapper extends BaseMapper<CompletionInfo> {
+
+    /**
+     * 完工入库分页
+     */
+    Page<CompletionInfoVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<CompletionInfo> wrapper);
+
+}

hx-mes/src/main/java/com/fjhx/mes/mapper/production/ProductionTaskMapper.java

@@ -1,5 +1,6 @@
 package com.fjhx.mes.mapper.production;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fjhx.mes.entity.production.po.ProductionTask;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,6 +8,8 @@ import com.fjhx.mes.entity.production.vo.ProductionTaskVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -23,4 +26,6 @@ public interface ProductionTaskMapper extends BaseMapper<ProductionTask> {
      */
     Page<ProductionTaskVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductionTask> wrapper);
 
+    ProductionTaskVo detail(@Param("id") Long id);
+    List<ProductionTaskVo> myListByIds(@Param("ew") QueryWrapper<ProductionTask> wrapper);
 }

hx-mes/src/main/java/com/fjhx/mes/service/completion/CompletionInfoService.java

@@ -0,0 +1,46 @@
+package com.fjhx.mes.service.completion;
+
+import com.fjhx.mes.entity.completion.po.CompletionInfo;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.completion.vo.CompletionInfoVo;
+import com.fjhx.mes.entity.completion.dto.CompletionInfoSelectDto;
+import com.fjhx.mes.entity.completion.dto.CompletionInfoDto;
+
+
+/**
+ * <p>
+ * 完工入库 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+public interface CompletionInfoService extends BaseService<CompletionInfo> {
+
+    /**
+     * 完工入库分页
+     */
+    Page<CompletionInfoVo> getPage(CompletionInfoSelectDto dto);
+
+    /**
+     * 完工入库明细
+     */
+    CompletionInfoVo detail(Long id);
+
+    /**
+     * 完工入库新增
+     */
+    void add(CompletionInfoDto completionInfoDto);
+
+    /**
+     * 完工入库编辑
+     */
+    void edit(CompletionInfoDto completionInfoDto);
+
+    /**
+     * 完工入库删除
+     */
+    void delete(Long id);
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/completion/impl/CompletionInfoServiceImpl.java

@@ -0,0 +1,123 @@
+package com.fjhx.mes.service.completion.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.fjhx.item.entity.product.po.ProductInfo;
+import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.mes.entity.completion.po.CompletionInfo;
+import com.fjhx.mes.entity.production.po.ProductionTask;
+import com.fjhx.mes.entity.production.vo.ProductionTaskVo;
+import com.fjhx.mes.mapper.completion.CompletionInfoMapper;
+import com.fjhx.mes.service.completion.CompletionInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.mes.service.production.ProductionTaskService;
+import com.fjhx.wms.entity.stock.po.StockWait;
+import com.fjhx.wms.service.stock.StockWaitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.completion.vo.CompletionInfoVo;
+import com.fjhx.mes.entity.completion.dto.CompletionInfoSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.mes.entity.completion.dto.CompletionInfoDto;
+import cn.hutool.core.bean.BeanUtil;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 完工入库 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-03-31
+ */
+@Service
+public class CompletionInfoServiceImpl extends ServiceImpl<CompletionInfoMapper, CompletionInfo> implements CompletionInfoService {
+    @Autowired
+    StockWaitService stockWaitService;
+    @Autowired
+    ProductionTaskService productionTaskService;
+    @Autowired
+    ProductInfoService productInfoService;
+
+    @Override
+    public Page<CompletionInfoVo> getPage(CompletionInfoSelectDto dto) {
+        IWrapper<CompletionInfo> wrapper = getWrapper();
+        wrapper.orderByDesc("ci", CompletionInfo::getId);
+        Page<CompletionInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<CompletionInfoVo> records = page.getRecords();
+        List<Long> productionTaskIds = records.stream().map(CompletionInfo::getProductionTaskId).collect(Collectors.toList());
+        if (ObjectUtil.isNotEmpty(productionTaskIds)) {
+            List<ProductionTaskVo> productionTaskVoList = productionTaskService.myListByIds(productionTaskIds);
+            Map<Long, ProductionTaskVo> productionTaskVoMap = productionTaskVoList.stream().collect(Collectors.groupingBy(ProductionTaskVo::getId,
+                    Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
+            List<Long> productIds = productionTaskVoList.stream().map(ProductionTaskVo::getProductId).collect(Collectors.toList());
+            if(ObjectUtil.isNotEmpty(productIds)) {
+                List<ProductInfo> productInfos = productInfoService.listByIds(productIds);
+                Map<Long, ProductInfo> productInfoMap = productInfos.stream().collect(Collectors.groupingBy(ProductInfo::getId,
+                        Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
+                for (CompletionInfoVo completionInfoVo : records) {
+                    ProductionTaskVo productionTaskVo = productionTaskVoMap.get(completionInfoVo.getProductionTaskId());
+                    if (ObjectUtil.isNotEmpty(productionTaskVo)) {
+                        //赋值产品名
+                        ProductInfo productInfo = productInfoMap.get(productionTaskVo.getProductId());
+                        if(ObjectUtil.isNotEmpty(productInfo)){
+                            completionInfoVo.setProductName(productInfo.getName());
+                        }
+                        //复制任务编号
+                        completionInfoVo.setProductionTaskCode(productionTaskVo.getCode());
+                    }
+                }
+            }
+        }
+        return page;
+    }
+
+    @Override
+    public CompletionInfoVo detail(Long id) {
+        CompletionInfo CompletionInfo = this.getById(id);
+        CompletionInfoVo result = BeanUtil.toBean(CompletionInfo, CompletionInfoVo.class);
+        Long productionTaskId = result.getProductionTaskId();
+        ProductionTaskVo productionTask = productionTaskService.detail(productionTaskId);
+        if(ObjectUtil.isNotEmpty(productionTask)) {
+            result.setProductionTaskCode(productionTask.getCode());
+            result.setProductName(productionTask.getProductName());
+            result.setProductionTaskQuantity(productionTask.getQuantity());
+            result.setPersonLiableName(productionTask.getPersonLiableName());
+            result.setProductionTaskDueDate(productionTask.getDueDate());
+        }
+        return result;
+    }
+
+    @Override
+    public void add(CompletionInfoDto completionInfoDto) {
+        this.save(completionInfoDto);
+        //查询任务信息
+        ProductionTaskVo detail = productionTaskService.detail(completionInfoDto.getProductionTaskId());
+        //添加一条完工入库类型的待入库数据
+        StockWait stockWait = new StockWait();
+        stockWait.setType(1);
+        stockWait.setBusinessType(2);
+        stockWait.setBusinessId(completionInfoDto.getId());
+        stockWait.setProductId(detail.getProductId());
+        stockWait.setQuantity(completionInfoDto.getQuantity());
+        stockWait.setReceiptQuantity(BigDecimal.ZERO);
+        stockWait.setStatus(0);
+        stockWaitService.save(stockWait);
+    }
+
+    @Override
+    public void edit(CompletionInfoDto completionInfoDto) {
+        this.updateById(completionInfoDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/production/ProductionTaskService.java

@@ -1,11 +1,16 @@
 package com.fjhx.mes.service.production;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fjhx.mes.entity.production.po.ProductionTask;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.mes.entity.production.vo.ProductionTaskVo;
 import com.fjhx.mes.entity.production.dto.ProductionTaskSelectDto;
 import com.fjhx.mes.entity.production.dto.ProductionTaskDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
@@ -43,4 +48,6 @@ public interface ProductionTaskService extends BaseService<ProductionTask> {
      */
     void delete(Long id);
 
+    List<ProductionTaskVo> myListByIds(List<Long> ids);
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskServiceImpl.java

@@ -1,6 +1,8 @@
 package com.fjhx.mes.service.production.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.production.po.ProductionPlan;
@@ -11,6 +13,7 @@ import com.fjhx.mes.service.production.ProductionTaskService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.mes.utils.code.CodeEnum;
 import com.ruoyi.system.utils.UserUtil;
+import org.apache.ibatis.annotations.Param;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +24,7 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.mes.entity.production.dto.ProductionTaskDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -74,9 +78,16 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
 
     @Override
     public ProductionTaskVo detail(Long id) {
-        ProductionTask ProductionTask = this.getById(id);
-        ProductionTaskVo result = BeanUtil.toBean(ProductionTask, ProductionTaskVo.class);
-        return result;
+        ProductionTaskVo productionTaskVo = baseMapper.detail(id);
+        ProductInfo productInfo = productInfoService.getById(productionTaskVo.getProductId());
+        if(ObjectUtil.isNotEmpty(productInfo)) {
+            productionTaskVo.setProductName(productInfo.getName());
+        }
+        Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(Arrays.asList(productionTaskVo.getPersonLiableId()));
+        if(ObjectUtil.isNotEmpty(nickNameMapByIds)) {
+            productionTaskVo.setPersonLiableName(nickNameMapByIds.get(productionTaskVo.getPersonLiableId()));
+        }
+        return productionTaskVo;
     }
 
     @Override
@@ -95,4 +106,11 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
         this.removeById(id);
     }
 
+    @Override
+    public List<ProductionTaskVo> myListByIds(List<Long> ids){
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.in("pt.id",ids);
+        return baseMapper.myListByIds(queryWrapper);
+    }
+
 }

hx-mes/src/main/resources/mapper/completion/CompletionInfoMapper.xml

@@ -0,0 +1,17 @@
+<?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.completion.CompletionInfoMapper">
+    <select id="getPage" resultType="com.fjhx.mes.entity.completion.vo.CompletionInfoVo">
+        select
+            ci.id,
+            ci.production_task_id,
+            ci.quantity,
+            ci.create_user,
+            ci.create_time,
+            ci.update_user,
+            ci.update_time
+        from completion_info ci
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-mes/src/main/resources/mapper/production/ProductionTaskMapper.xml

@@ -21,5 +21,26 @@
                 LEFT JOIN work_order wo ON pp.work_order_id = wo.id
             ${ew.customSqlSegment}
     </select>
+    <select id="detail" resultType="com.fjhx.mes.entity.production.vo.ProductionTaskVo">
+        SELECT
+            pt.*,
+            wo.product_id
+        FROM
+            production_task pt
+                LEFT JOIN production_plan pp ON pt.production_plan_id = pp.id
+                LEFT JOIN work_order wo ON pp.work_order_id = wo.id
+        WHERE
+            pt.id = #{id}
+    </select>
+    <select id="myListByIds" resultType="com.fjhx.mes.entity.production.vo.ProductionTaskVo">
+        SELECT
+            pt.*,
+            wo.product_id
+        FROM
+            production_task pt
+                LEFT JOIN production_plan pp ON pt.production_plan_id = pp.id
+                LEFT JOIN work_order wo ON pp.work_order_id = wo.id
+            ${ew.customSqlSegment}
+    </select>
 
 </mapper>

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWait.java

@@ -25,6 +25,9 @@ public class StockWait extends BasePo {
      */
     private Integer type;
 
+    /**业务类型*/
+    private Integer businessType;
+
     /**
      * 业务id
      */

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -1,6 +1,8 @@
 package com.fjhx.wms.service.stock.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.wms.entity.stock.po.Stock;
@@ -31,6 +33,7 @@ import java.util.stream.Collectors;
  * @author 
  * @since 2023-03-22
  */
+@DS(SourceConstant.WMS)
 @Service
 public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait> implements StockWaitService {
     @Autowired