添加ERP报工相关文件

ZengTao

2024-07-30 88710f1598318a58ca0f39915fe9c30f5cb46df5

添加ERP报工相关文件

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/BasicDataProduceController.java

New file
@@ -0,0 +1,39 @@
package com.mes.pp.controller;


import com.mes.pp.service.BasicDataProduceService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author wu
 * @since 2024-07-25
 */
@Api(description = "生产基础数据")
@RestController
@RequestMapping("/basic_data_produce")
public class BasicDataProduceController {

    @Autowired
    //获取待选择的工程号
    private BasicDataProduceService basicDataProduceService;

    @ApiOperation("查询基础数据")
    @PostMapping("/selectBasicDataProduceGroup") //显示工程选择信息
    @ResponseBody
    public Result selectBasicDataProduceGroup() {
        return Result.build(200, "查询成功", basicDataProduceService.selectBasicDataProduceGroup());
    }
}


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/DamageDetailsController.java

New file
@@ -0,0 +1,31 @@
package com.mes.pp.controller;


import com.mes.pp.entity.BasicDataProduce;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.service.BasicDataProduceService;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author wu
 * @since 2024-07-26
 */
@RestController
@RequestMapping("/damage_details")
public class DamageDetailsController {


}


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkDetailController.java

New file
@@ -0,0 +1,21 @@
package com.mes.pp.controller;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author wu
 * @since 2024-07-25
 */
@RestController
@RequestMapping("/reporting-work-detail")
public class ReportingWorkDetailController {

}


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/BasicDataProduce.java

New file
@@ -0,0 +1,55 @@
package com.mes.pp.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * <p>
 * 
 * </p>
 *
 * @author wu
 * @since 2024-07-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class BasicDataProduce implements Serializable {

    private static final long serialVersionUID = 1L;

      @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * 基础数据类型
     */
    private String basicType;

    /**
     * 基础数据名称
     */
    private String basicName;

    /**
     * 基础数据类别
     */
    private String basicCategory;

    /**
     * 创建时间
     */
    private Timestamp createTime;

    /**
     * 修改时间
     */
    private Timestamp updateTime;


}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/DamageDetails.java

New file
@@ -0,0 +1,115 @@
package com.mes.pp.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * <p>
 * 
 * </p>
 *
 * @author wu
 * @since 2024-07-26
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class DamageDetails implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * <次破明细表>
     */
      @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 报工编号
     */
    private String reportingWorkId;

    /**
     * 流程卡号
     */
    private String processId;

    /**
     * 序号
     */
    private Integer orderNumber;

    /**
     * 工艺确认序号（层号）
     */
    private Integer technologyNumber;

    /**
     * 次破数量
     */
    private Integer breakageQuantity;

    /**
     * 次破类型
     */
    private String breakageType;

    /**
     * 次破原因
     */
    private String breakageReason;

    /**
     * 可利用（默认0，需要返工1）
     */
    private Integer available;

    /**
     * 返工/补片数量
     */
    private Integer quantity;

    /**
     * 返工工序
     */
    private String returnProcess;

    /**
     * 责任工序
     */
    private String responsibleProcess;

    /**
     * 责任人员
     */
    private String responsiblePersonnel;

    /**
     * 责任班组
     */
    private String responsibleTeam;

    /**
     * 责任设备
     */
    private String responsibleEquipment;

    /**
     * 质检员
     */
    private String qualityInspector;

    /**
     * 补片状态（默认0，已补片1）
     */
    private Integer patchStatus;

    /**
     * 质检状态（默认0,1待质检1，已质检2）
     */
    private Integer qualityInsStatus;


}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java

New file
@@ -0,0 +1,151 @@
package com.mes.pp.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * <p>
 * 
 * </p>
 *
 * @author wu
 * @since 2024-07-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class ReportingWorkDetail implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * <报工明细>
     */
      @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 报工编号
     */
    private String reportingWorkId;

    /**
     * 序号
     */
    private Integer orderNumber;

    /**
     * 工艺确认序号
     */
    private Integer technologyNumber;

    /**
     * 完工数量
     */
    private Integer completedQuantity;

    /**
     * 次破数量
     */
    private Integer breakageQuantity;

    /**
     * 次破类型
     */
    private String breakageType;

    /**
     * 次破原因
     */
    private String breakageReason;

    /**
     * 可利用（1可利用0默认）
     */
    private Integer available;

    /**
     * 退回工序
     */
    private String returnProcess;

    /**
     * 责任工序
     */
    private String responsibleProcess;

    /**
     * 责任人员
     */
    private String responsiblePersonnel;

    /**
     * 责任班组
     */
    private String responsibleTeam;

    /**
     * 责任设备
     */
    private String responsibleEquipment;

    /**
     * 质检员
     */
    private String qualityInspector;

    /**
     * 补片状态
     */
    private Integer patchStatus;

    /**
     * 在制品名称
     */
    private String workProgress;

    /**
     * 质检状态
     */
    private Integer qualityInsStatus;

    /**
     * 报工类型
     */
    private Integer type;

    /**
     * 待返工数量
     */
    private Integer waitReworkQuantity;

    /**
     * 返工班组
     */
    private String reworkTeam;

    /**
     * 返工审核人
     */
    private String reviewer;

    /**
     * 返工审核状态
     */
    private String reviewStatus;

    /**
     * 返工时间
     */
    private LocalDateTime reworkTime;

    /**
     * 返工修改时间
     */
    private LocalDateTime reworkUpdateTime;


}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/BasicDataProduceMapper.java

New file
@@ -0,0 +1,18 @@
package com.mes.pp.mapper;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.pp.entity.BasicDataProduce;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wu
 * @since 2024-07-25
 */
@DS("pp")
public interface BasicDataProduceMapper extends BaseMapper<BasicDataProduce> {

}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/ReportingWorkDetailMapper.java

New file
@@ -0,0 +1,16 @@
package com.mes.pp.mapper;

import com.mes.pp.entity.ReportingWorkDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wu
 * @since 2024-07-25
 */
public interface ReportingWorkDetailMapper extends BaseMapper<ReportingWorkDetail> {

}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/BasicDataProduceService.java

New file
@@ -0,0 +1,20 @@
package com.mes.pp.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.pp.entity.BasicDataProduce;

import java.util.List;
import java.util.Map;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author wu
 * @since 2024-07-25
 */
public interface BasicDataProduceService extends IService<BasicDataProduce> {

    Map<String, List<BasicDataProduce>> selectBasicDataProduceGroup();
}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/DamageDetailsService.java

New file
@@ -0,0 +1,16 @@
package com.mes.pp.service;

import com.mes.pp.entity.DamageDetails;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author wu
 * @since 2024-07-26
 */
public interface DamageDetailsService extends IService<DamageDetails> {

}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkDetailService.java

New file
@@ -0,0 +1,16 @@
package com.mes.pp.service;

import com.mes.pp.entity.ReportingWorkDetail;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author wu
 * @since 2024-07-25
 */
public interface ReportingWorkDetailService extends IService<ReportingWorkDetail> {

}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/BasicDataProduceServiceImpl.java

New file
@@ -0,0 +1,30 @@
package com.mes.pp.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.pp.entity.BasicDataProduce;
import com.mes.pp.mapper.BasicDataProduceMapper;
import com.mes.pp.service.BasicDataProduceService;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author wu
 * @since 2024-07-25
 */
@Service
public class BasicDataProduceServiceImpl extends ServiceImpl<BasicDataProduceMapper, BasicDataProduce> implements BasicDataProduceService {

    @Override
    public Map<String, List<BasicDataProduce>> selectBasicDataProduceGroup(){
        List<BasicDataProduce> basicDataProduceList=baseMapper.selectList(null);
        Map<String, List<BasicDataProduce>> listMap = basicDataProduceList.stream().collect(Collectors.groupingBy(item -> item.getBasicType()));
        return listMap;
    }
}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/DamageDetailsService.java

New file
@@ -0,0 +1,16 @@
package com.mes.pp.service.impl;

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.pp.entity.DamageDetails;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author wu
 * @since 2024-07-26
 */
public interface DamageDetailsService extends IService<DamageDetails> {

}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkDetailService.java

New file
@@ -0,0 +1,16 @@
package com.mes.pp.service.impl;

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.pp.entity.ReportingWorkDetail;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author wu
 * @since 2024-07-25
 */
public interface ReportingWorkDetailService extends IService<ReportingWorkDetail> {

}