Merge remote-tracking branch 'origin/dev' into dev

mes/src/main/java/com/ximai/mes/pro/mapper/ProFeedbackMapper.java

@@ -6,8 +6,7 @@ import com.ximai.mes.pro.domain.vo.ProFeedbackVo;
 import com.ximai.mes.pro.domain.vo.ProProcessTaskVo;
 import com.ximai.mes.pro.dto.ProFeedbackDto;
 import com.ximai.mes.report.request.FeedbackRequest;
-import com.ximai.mes.report.response.FeedbackResponse;
-import com.ximai.mes.report.response.WorkOrderProgressFeedbackListResponse;
+import com.ximai.mes.report.response.*;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.security.core.parameters.P;
@@ -145,4 +144,19 @@ public interface ProFeedbackMapper {
 
     List<WorkOrderProgressFeedbackListResponse> getFeedbackList(@Param("workorderCode")String workorderCode,@Param("taskId") Long taskId,@Param("taskWorkunitId") Long taskWorkunitId);
 
+    List<FeedbackResponseExportByList> export(FeedbackRequest feedbackRequest);
+
+    List<FeedbackResponseExportByWorkOrder> getListByWorkOrderExport(FeedbackRequest feedbackRequest);
+
+    List<FeedbackResponseExportByWorkshop> getListByWorkshopExport(FeedbackRequest feedbackRequest);
+
+    List<FeedbackResponseExportByWorkstation> getListByWorkstationExport(FeedbackRequest feedbackRequest);
+
+    List<FeedbackResponseExportByWorkunit> getListByWorkunitExport(FeedbackRequest feedbackRequest);
+
+    List<FeedbackResponseExportByProcess> getListByProcessExport(FeedbackRequest feedbackRequest);
+
+    List<FeedbackResponseExportByUser> getListByUserExport(FeedbackRequest feedbackRequest);
+
+    List<FeedbackResponseExportByDefect> getListByDefectExport(FeedbackRequest feedbackRequest);
 }

mes/src/main/java/com/ximai/mes/report/response/FeedbackResponseExportByDefect.java

+package com.ximai.mes.report.response;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class FeedbackResponseExportByDefect {
+    /** 异常原因 */
+    @ApiModelProperty(     "异常原因")
+    @Excel(name = "异常原因")
+    private String abnormalReason;
+
+    @ApiModelProperty("异常备注")
+    @Excel(name = "异常备注")
+    private String abnormalRemark;
+
+
+    /**
+     * 本次报工数量
+     */
+    @ApiModelProperty(     "报工数量")
+    @Excel(name = "报工数量")
+    private BigDecimal quantityFeedback;
+
+    /**
+     * 合格品数量
+     */
+    @ApiModelProperty(     "合格数量")
+    @Excel(name = "合格数量")
+    private BigDecimal quantityQualify;
+
+    /**
+     * 不良品数量
+     */
+    @ApiModelProperty(     "不合格数量")
+    @Excel(name = "不合格数量")
+    private BigDecimal quantityUnqualify;
+
+
+
+
+    @ApiModelProperty("良率")
+    @Excel(name = "良率")
+    private String qualificationRate;
+}

mes/src/main/java/com/ximai/mes/report/response/FeedbackResponseExportByList.java

+package com.ximai.mes.report.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class FeedbackResponseExportByList {
+    /**
+     * 工单类型
+     */
+    @ApiModelProperty(     "工单类型")
+    @Excel(name = "工单类型")
+    private String workorderType;
+
+    @ApiModelProperty("客户项目号")
+    @Excel(name = "客户项目号")
+    private String customerProjectNo;
+
+    @ApiModelProperty("订单单号")
+    @Excel(name = "订单单号")
+    private String orderCode;
+
+    @ApiModelProperty(     "工单编码")
+    @Excel(name = "生产工单")
+    private String workorderCode;
+
+    @ApiModelProperty(     "工单名称")
+    //@Excel(name = "工单名称")
+    private String workorderName;
+
+    /**
+     * 产品编号
+     */
+    @ApiModelProperty(     "产品编号")
+    @Excel(name = "产品编号")
+    private String productCode;
+
+    /**
+     * 产品名称
+     */
+    @ApiModelProperty(     "产品名称")
+    @Excel(name = "产品名称")
+    private String productName;
+
+
+    /**
+     * 任务编号
+     */
+    @ApiModelProperty(     "工序任务号")
+    @Excel(name = "工序任务号")
+    private String taskCode;
+
+
+
+    /**
+     * 工序名称
+     */
+    @ApiModelProperty(     "工序编码")
+    @Excel(name = "工序编码")
+    private String processCode;
+    /**
+     * 工序名称
+     */
+    @ApiModelProperty(     "工序名称")
+    @Excel(name = "工序名称")
+    private String processName;
+
+
+    /**
+     * 工作中心编号
+     */
+    @ApiModelProperty(     "工作中心编号")
+    @Excel(name = "工作中心编号")
+    private String workstationCode;
+
+    /**
+     * 工作中心名称
+     */
+    @ApiModelProperty(     "工作中心名称")
+    @Excel(name = "工作中心名称")
+    private String workstationName;
+
+
+    /**
+     *
+     */
+    @ApiModelProperty("工作单元编码")
+    @Excel(name = "工作单元编码")
+    private String workunitCode;
+
+    @ApiModelProperty("工作单元名称")
+    @Excel(name = "工作单元名称")
+    private String workunitName;
+
+    @ApiModelProperty("报工人员")
+    @Excel(name = "报工人员")
+    private String userName;
+
+    @ApiModelProperty("报工人员名称")
+    @Excel(name = "报工人员名称")
+    private String nickName;
+
+    /**
+     * 排产数量
+     */
+    @ApiModelProperty(     "派工数量")
+    @Excel(name = "派工数量")
+    private BigDecimal quantity;
+
+
+    /**
+     * 本次报工数量
+     */
+    @ApiModelProperty(     "报工数量")
+    @Excel(name = "报工数量")
+    private BigDecimal quantityFeedback;
+
+    /**
+     * 合格品数量
+     */
+    @ApiModelProperty(     "合格数量")
+    @Excel(name = "合格数量")
+    private BigDecimal quantityQualify;
+
+    /**
+     * 不良品数量
+     */
+    @ApiModelProperty(     "不合格数量")
+    @Excel(name = "不合格数量")
+    private BigDecimal quantityUnqualify;
+
+
+    /** 异常原因 */
+    @ApiModelProperty(     "异常原因")
+    @Excel(name = "不合格原因")
+    private String abnormalReason;
+
+    @ApiModelProperty("标准工时")
+    @Excel(name = "标准工时")
+    private BigDecimal stdWorkingTime;
+
+    @ApiModelProperty("实际工时")
+    @Excel(name = "实际工时")
+    private BigDecimal machineTime;
+
+
+
+//    @ApiModelProperty("实际工时")
+//    @Excel(name = "实际工时")
+    private BigDecimal machineTimeBigDecimal;
+    /**
+     * 预计结束时间
+     */
+    @ApiModelProperty("计划完成时间")
+    @Excel(name = "计划完成时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date scheduleEndDate;
+    /**
+     * 报工时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(     "报工时间")
+    @Excel(name = "报工时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date feedbackTime;
+}

mes/src/main/java/com/ximai/mes/report/response/FeedbackResponseExportByProcess.java

+package com.ximai.mes.report.response;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class FeedbackResponseExportByProcess {
+
+    /**
+     * 工序名称
+     */
+    @ApiModelProperty(     "工序编码")
+    @Excel(name = "工序编码")
+    private String processCode;
+    /**
+     * 工序名称
+     */
+    @ApiModelProperty(     "工序名称")
+    @Excel(name = "工序名称")
+    private String processName;
+
+
+    /**
+     * 本次报工数量
+     */
+    @ApiModelProperty(     "报工数量")
+    @Excel(name = "报工数量")
+    private BigDecimal quantityFeedback;
+
+    /**
+     * 合格品数量
+     */
+    @ApiModelProperty(     "合格数量")
+    @Excel(name = "合格数量")
+    private BigDecimal quantityQualify;
+
+    /**
+     * 不良品数量
+     */
+    @ApiModelProperty(     "不合格数量")
+    @Excel(name = "不合格数量")
+    private BigDecimal quantityUnqualify;
+
+
+
+
+    @ApiModelProperty("良率")
+    @Excel(name = "良率")
+    private String qualificationRate;
+}

mes/src/main/java/com/ximai/mes/report/response/FeedbackResponseExportByUser.java

+package com.ximai.mes.report.response;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class FeedbackResponseExportByUser {
+
+    @ApiModelProperty("报工人员")
+    @Excel(name = "报工人员")
+    private String userName;
+
+    @ApiModelProperty("报工人员名称")
+    @Excel(name = "报工人员名称")
+    private String nickName;
+
+    /**
+     * 本次报工数量
+     */
+    @ApiModelProperty(     "报工数量")
+    @Excel(name = "报工数量")
+    private BigDecimal quantityFeedback;
+
+    /**
+     * 合格品数量
+     */
+    @ApiModelProperty(     "合格数量")
+    @Excel(name = "合格数量")
+    private BigDecimal quantityQualify;
+
+    /**
+     * 不良品数量
+     */
+    @ApiModelProperty(     "不合格数量")
+    @Excel(name = "不合格数量")
+    private BigDecimal quantityUnqualify;
+
+
+
+
+    @ApiModelProperty("良率")
+    @Excel(name = "良率")
+    private String qualificationRate;
+}

mes/src/main/java/com/ximai/mes/report/response/FeedbackResponseExportByWorkOrder.java

+package com.ximai.mes.report.response;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class FeedbackResponseExportByWorkOrder {
+    @ApiModelProperty(     "工单编码")
+    @Excel(name = "生产工单")
+    private String workorderCode;
+
+    @ApiModelProperty(     "工单名称")
+    @Excel(name = "工单名称")
+    private String workorderName;
+
+
+    /**
+     * 本次报工数量
+     */
+    @ApiModelProperty(     "报工数量")
+    @Excel(name = "报工数量")
+    private BigDecimal quantityFeedback;
+
+    /**
+     * 合格品数量
+     */
+    @ApiModelProperty(     "合格数量")
+    @Excel(name = "合格数量")
+    private BigDecimal quantityQualify;
+
+    /**
+     * 不良品数量
+     */
+    @ApiModelProperty(     "不合格数量")
+    @Excel(name = "不合格数量")
+    private BigDecimal quantityUnqualify;
+
+
+
+
+    @ApiModelProperty("良率")
+    @Excel(name = "良率")
+    private String qualificationRate;
+}

mes/src/main/java/com/ximai/mes/report/response/FeedbackResponseExportByWorkshop.java

+package com.ximai.mes.report.response;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class FeedbackResponseExportByWorkshop {
+    @ApiModelProperty("车间编号")
+    @Excel(name = "车间编号")
+    private String workshopCode;
+    @ApiModelProperty("车间名称")
+    @Excel(name = "车间名称")
+    private String workshopName;
+
+    /**
+     * 本次报工数量
+     */
+    @ApiModelProperty(     "报工数量")
+    @Excel(name = "报工数量")
+    private BigDecimal quantityFeedback;
+
+    /**
+     * 合格品数量
+     */
+    @ApiModelProperty(     "合格数量")
+    @Excel(name = "合格数量")
+    private BigDecimal quantityQualify;
+
+    /**
+     * 不良品数量
+     */
+    @ApiModelProperty(     "不合格数量")
+    @Excel(name = "不合格数量")
+    private BigDecimal quantityUnqualify;
+
+
+
+
+    @ApiModelProperty("良率")
+    @Excel(name = "良率")
+    private String qualificationRate;
+}

mes/src/main/java/com/ximai/mes/report/response/FeedbackResponseExportByWorkstation.java

+package com.ximai.mes.report.response;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class FeedbackResponseExportByWorkstation {
+    /**
+     * 工作中心编号
+     */
+    @ApiModelProperty(     "工作中心编号")
+    @Excel(name = "工作中心编号")
+    private String workstationCode;
+
+    /**
+     * 工作中心名称
+     */
+    @ApiModelProperty(     "工作中心名称")
+    @Excel(name = "工作中心名称")
+    private String workstationName;
+
+    /**
+     * 本次报工数量
+     */
+    @ApiModelProperty(     "报工数量")
+    @Excel(name = "报工数量")
+    private BigDecimal quantityFeedback;
+
+    /**
+     * 合格品数量
+     */
+    @ApiModelProperty(     "合格数量")
+    @Excel(name = "合格数量")
+    private BigDecimal quantityQualify;
+
+    /**
+     * 不良品数量
+     */
+    @ApiModelProperty(     "不合格数量")
+    @Excel(name = "不合格数量")
+    private BigDecimal quantityUnqualify;
+
+
+
+
+    @ApiModelProperty("良率")
+    @Excel(name = "良率")
+    private String qualificationRate;
+}

mes/src/main/java/com/ximai/mes/report/response/FeedbackResponseExportByWorkunit.java

+package com.ximai.mes.report.response;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class FeedbackResponseExportByWorkunit {
+    /**
+     *
+     */
+    @ApiModelProperty("工作单元编码")
+    @Excel(name = "工作单元编码")
+    private String workunitCode;
+
+    @ApiModelProperty("工作单元名称")
+    @Excel(name = "工作单元名称")
+    private String workunitName;
+
+    /**
+     * 本次报工数量
+     */
+    @ApiModelProperty(     "报工数量")
+    @Excel(name = "报工数量")
+    private BigDecimal quantityFeedback;
+
+    /**
+     * 合格品数量
+     */
+    @ApiModelProperty(     "合格数量")
+    @Excel(name = "合格数量")
+    private BigDecimal quantityQualify;
+
+    /**
+     * 不良品数量
+     */
+    @ApiModelProperty(     "不合格数量")
+    @Excel(name = "不合格数量")
+    private BigDecimal quantityUnqualify;
+
+
+
+
+    @ApiModelProperty("良率")
+    @Excel(name = "良率")
+    private String qualificationRate;
+}

mes/src/main/java/com/ximai/mes/report/service/FeedbackService.java

 package com.ximai.mes.report.service;
 
 import com.ximai.mes.report.request.FeedbackRequest;
-import com.ximai.mes.report.response.FeedbackResponse;
+import com.ximai.mes.report.response.*;
 
 import java.util.List;
 
 public interface FeedbackService {
     List<FeedbackResponse> getList(FeedbackRequest feedbackRequest);
+    List<FeedbackResponseExportByList> export(FeedbackRequest feedbackRequest);
 
     List<FeedbackResponse> getListByWorkOrder(FeedbackRequest feedbackRequest);
 
+    List<FeedbackResponseExportByWorkOrder> getListByWorkOrderExport(FeedbackRequest feedbackRequest);
+
     List<FeedbackResponse> getListByWorkshop(FeedbackRequest feedbackRequest);
 
+    List<FeedbackResponseExportByWorkshop> getListByWorkshopExport(FeedbackRequest feedbackRequest);
+
     List<FeedbackResponse> getListByWorkstation(FeedbackRequest feedbackRequest);
 
+    List<FeedbackResponseExportByWorkstation> getListByWorkstationExport(FeedbackRequest feedbackRequest);
+
     List<FeedbackResponse> getListByWorkunit(FeedbackRequest feedbackRequest);
 
+    List<FeedbackResponseExportByWorkunit> getListByWorkunitExport(FeedbackRequest feedbackRequest);
+
     List<FeedbackResponse> getListByProcess(FeedbackRequest feedbackRequest);
 
+    List<FeedbackResponseExportByProcess> getListByProcessExport(FeedbackRequest feedbackRequest);
+
     List<FeedbackResponse> getListByUser(FeedbackRequest feedbackRequest);
 
+    List<FeedbackResponseExportByUser> getListByUserExport(FeedbackRequest feedbackRequest);
+
+
     List<FeedbackResponse> getListByDefect(FeedbackRequest feedbackRequest);
+
+    List<FeedbackResponseExportByDefect> getListByDefectExport(FeedbackRequest feedbackRequest);
 }

mes/src/main/java/com/ximai/mes/report/service/impl/FeedbackServiceImp.java

@@ -3,7 +3,7 @@ package com.ximai.mes.report.service.impl;
 import com.ximai.mes.pro.domain.ProFeedback;
 import com.ximai.mes.pro.mapper.ProFeedbackMapper;
 import com.ximai.mes.report.request.FeedbackRequest;
-import com.ximai.mes.report.response.FeedbackResponse;
+import com.ximai.mes.report.response.*;
 import com.ximai.mes.report.service.FeedbackService;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,39 +19,79 @@ public class FeedbackServiceImp implements FeedbackService {
     public List<FeedbackResponse> getList(FeedbackRequest feedbackRequest) {
         return proFeedbackMapper.getList(feedbackRequest);
     }
+    @Override
+    public List<FeedbackResponseExportByList> export(FeedbackRequest feedbackRequest){
+        return proFeedbackMapper.export(feedbackRequest);
+    }
+
 
     @Override
     public List<FeedbackResponse> getListByWorkOrder(FeedbackRequest feedbackRequest) {
         return proFeedbackMapper.getListByWorkOrder(feedbackRequest);
     }
 
+    @Override
+    public List<FeedbackResponseExportByWorkOrder> getListByWorkOrderExport(FeedbackRequest feedbackRequest){
+        return proFeedbackMapper.getListByWorkOrderExport(feedbackRequest);
+    }
+
     @Override
     public List<FeedbackResponse> getListByWorkshop(FeedbackRequest feedbackRequest) {
         return proFeedbackMapper.getListByWorkshop(feedbackRequest);
     }
+    @Override
+    public List<FeedbackResponseExportByWorkshop> getListByWorkshopExport(FeedbackRequest feedbackRequest){
+        return proFeedbackMapper.getListByWorkshopExport(feedbackRequest);
+    }
 
     @Override
     public List<FeedbackResponse> getListByWorkstation(FeedbackRequest feedbackRequest) {
         return proFeedbackMapper.getListByWorkstation(feedbackRequest);
     }
+    @Override
+    public List<FeedbackResponseExportByWorkstation> getListByWorkstationExport(FeedbackRequest feedbackRequest){
+        return proFeedbackMapper.getListByWorkstationExport(feedbackRequest);
+    }
 
     @Override
     public List<FeedbackResponse> getListByWorkunit(FeedbackRequest feedbackRequest) {
         return proFeedbackMapper.getListByWorkunit(feedbackRequest);
     }
+    @Override
+    public List<FeedbackResponseExportByWorkunit> getListByWorkunitExport(FeedbackRequest feedbackRequest){
+        return proFeedbackMapper.getListByWorkunitExport(feedbackRequest);
+    }
 
     @Override
     public List<FeedbackResponse> getListByProcess(FeedbackRequest feedbackRequest) {
         return proFeedbackMapper.getListByProcess(feedbackRequest);
     }
 
+    @Override
+    public  List<FeedbackResponseExportByProcess> getListByProcessExport(FeedbackRequest feedbackRequest){
+        return proFeedbackMapper.getListByProcessExport(feedbackRequest);
+    }
+
     @Override
     public List<FeedbackResponse> getListByUser(FeedbackRequest feedbackRequest) {
         return proFeedbackMapper.getListByUser(feedbackRequest);
     }
 
+    @Override
+    public List<FeedbackResponseExportByUser> getListByUserExport(FeedbackRequest feedbackRequest){
+        return proFeedbackMapper.getListByUserExport(feedbackRequest);
+    }
+
     @Override
     public List<FeedbackResponse> getListByDefect(FeedbackRequest feedbackRequest) {
         return proFeedbackMapper.getListByDefect(feedbackRequest);
     }
+
+
+
+    @Override
+    public List<FeedbackResponseExportByDefect> getListByDefectExport(FeedbackRequest feedbackRequest){
+        return proFeedbackMapper.getListByDefectExport(feedbackRequest);
+    }
+
 }