Merge remote-tracking branch 'origin/master'

op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskDTO.java

@@ -135,6 +135,24 @@ public class QcCheckTaskDTO extends BaseEntity {
 	private BigDecimal aNoOkquality;
 	private BigDecimal bNoOkquality;
 	private BigDecimal cNoOkquality;
+    private String className;
+	private String reason;
+
+	public String getClassName() {
+		return className;
+	}
+
+	public void setClassName(String className) {
+		this.className = className;
+	}
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
 
 	public BigDecimal getSampleQuality() {
 		return sampleQuality;

op-modules/op-mes/src/main/java/com/op/mes/controller/MesInspectionReportController.java

@@ -1,7 +1,9 @@
 package com.op.mes.controller;
 
 import com.op.common.core.web.controller.BaseController;
+import com.op.common.core.web.domain.AjaxResult;
 import com.op.mes.domain.MesInspectionReport;
+import com.op.mes.domain.ProOrderWorkorder;
 import com.op.mes.service.IMesInspectionReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,12 +23,24 @@ public class MesInspectionReportController extends BaseController {
         return iMesInspectionReportService.selectSelfMutualInspectionList(mesInspectionReport);
     }
 
-    //自检互检记录报表 产品名称 检查人 生产产线 检查日期 异常处理 备注
+    //查询表头表尾内容
     @GetMapping("/selfMutualInspectionData")
     public MesInspectionReport selfMutualInspectionData(MesInspectionReport mesInspectionReport) {
         return iMesInspectionReportService.selfMutualInspectionData(mesInspectionReport);
     }
 
+    //修改整个表
+    @PutMapping("/updateTable")
+    public AjaxResult updateTable(@RequestBody MesInspectionReport mesInspectionReport) {
+        return iMesInspectionReportService.updateTable(mesInspectionReport);
+    }
+
+    //修改点检表
+    @PutMapping("/updatePointInspectionTable")
+    public AjaxResult updatePointInspectionTable(@RequestBody MesInspectionReport mesInspectionReport) {
+        return iMesInspectionReportService.updatePointInspectionTable(mesInspectionReport);
+    }
+
     //查询产线
     @GetMapping("/getLineCodeList")
     public List<MesInspectionReport> getLineCodeList() {
@@ -34,13 +48,27 @@ public class MesInspectionReportController extends BaseController {
         return list;
     }
 
-    //首检记录 左侧报表 主体 查询
+    //查询产品列表
+    @GetMapping("/getProductList")
+    public List<MesInspectionReport> getProductList(MesInspectionReport mesInspectionReport) {
+        List<MesInspectionReport> list = iMesInspectionReportService.getProductList(mesInspectionReport);
+        return list;
+    }
+
+    //通过查询工单列表查询日期码
+    @GetMapping("/getWorkList")
+    public List<ProOrderWorkorder> getWorkList(MesInspectionReport mesInspectionReport) {
+        List<ProOrderWorkorder> list = iMesInspectionReportService.getWorkList(mesInspectionReport);
+        return list;
+    }
+
+    //这个不用了
     @GetMapping("/listFirstInspectionLeft")
     public List<MesInspectionReport> firstInspectionLeftList(MesInspectionReport mesInspectionReport) {
         return iMesInspectionReportService.selectFirstInspectionLeftList(mesInspectionReport);
     }
 
-    //首检记录 右侧报表 主体 查询
+    //这个也不用了
     @GetMapping("/listFirstInspectionRight")
     public List<MesInspectionReport> firstInspectionRightList(MesInspectionReport mesInspectionReport) {
         return iMesInspectionReportService.selectFirstInspectionRightList(mesInspectionReport);
@@ -51,10 +79,4 @@ public class MesInspectionReportController extends BaseController {
     public List<MesInspectionReport> listPointInspection(MesInspectionReport mesInspectionReport) {
         return iMesInspectionReportService.selectPointInspectionList(mesInspectionReport);
     }
-
-    //点检记录
-    @GetMapping("/listCheckBox")
-    public List<MesInspectionReport> listCheckBox(MesInspectionReport mesInspectionReport) {
-        return iMesInspectionReportService.selectCheckBoxList(mesInspectionReport);
-    }
 }

op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareController.java

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.op.common.core.domain.R;
 import com.op.common.core.utils.uuid.IdUtils;
+import com.op.system.api.domain.quality.QcCheckTaskDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -113,4 +114,25 @@ public class MesPrepareController extends BaseController {
     public R reportWorkTask() {
         return mesPrepareService.reportWorkTask();
     }
+
+    /**
+     * 查询备料单列表
+     */
+    @GetMapping("/getBomTraceList")
+    @Log(title = "产品主键追溯备料单查询", businessType = BusinessType.QUERY)
+    public TableDataInfo getBomTraceList(MesPrepare mesPrepare) {
+        startPage();
+        List<MesPrepare> list = mesPrepareService.getBomTraceList(mesPrepare);
+        return getDataTable(list);
+    }
+    /**
+     * 查询备料单列表
+     */
+    @GetMapping("/getCheckTaskTraceList")
+    @Log(title = "产品主键追溯检验任务查询", businessType = BusinessType.QUERY)
+    public TableDataInfo getCheckTaskTraceList(QcCheckTaskDTO dto) {
+        startPage();
+        List<QcCheckTaskDTO> list = mesPrepareService.getCheckTaskTraceList(dto);
+        return getDataTable(list);
+    }
 }

op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java

@@ -662,7 +662,7 @@ public class MesReportWorkController extends BaseController {
 	/**
 	 * 黑蚊香车间月度汇总表
 	 */
-	@RequiresPermissions("mes:monthProductionSut:list")
+
 	@GetMapping("/getmonthProductionSut")
 	public AjaxResult getmonthProductionSut(MesMonthReportVo mesMonthReportVo) {
 		SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");

op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java

@@ -1,23 +1,30 @@
 package com.op.mes.controller;
 
+import com.op.common.core.domain.ExcelCol;
 import com.op.common.core.domain.R;
 import com.op.common.core.utils.bean.BeanUtils;
+import com.op.common.core.utils.poi.ExcelMapUtil;
 import com.op.common.core.utils.poi.ExcelUtil;
 import com.op.common.core.web.controller.BaseController;
 import com.op.common.core.web.page.TableDataInfo;
 import com.op.common.security.annotation.RequiresPermissions;
 import com.op.mes.domain.*;
+import com.op.mes.domain.vo.DynamicColumnVo;
 import com.op.mes.service.IMesReportWorksService;
 import com.op.common.core.utils.bean.BeanUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import static com.op.common.core.utils.PageUtils.startPage;
 
@@ -80,4 +87,50 @@ public class MesReportWorksController extends BaseController {
         }
 
     }
+    /**烘房产量统计**/
+    @GetMapping("/getHFProductionList")
+    public List<Map<String, Object>>  getHFProductionList(HFProduction dto) {
+        List<DynamicColumnVo> equNames = this.getHFProductionTitle(dto);
+        dto.setEquNames(equNames);
+        List<Map<String, Object>> list = mesReportWorksService.getHFProductionList(dto);
+        return list;
+    }
+    @GetMapping("/getHFProductionTitle")
+    public List<DynamicColumnVo> getHFProductionTitle(HFProduction dto) {
+        List<DynamicColumnVo> list = mesReportWorksService.getHFProductionTitle(dto);
+        return list;
+    }
+    @PostMapping("/getHFProductionExport")
+    public void getHFProductionExport(HttpServletResponse response,HFProduction dto) {
+        List<DynamicColumnVo> equNames = this.getHFProductionTitle(dto);
+        dto.setEquNames(equNames);
+        List<Map<String, Object>> list = mesReportWorksService.getHFProductionList(dto);
+
+        ArrayList<ExcelCol> excelCols = new ArrayList<>();
+        excelCols.add(new ExcelCol("日期","ymd",20));
+        for (DynamicColumnVo column : equNames) {
+            excelCols.add(new ExcelCol(column.getLabel(), column.getCode(), 20));
+        }
+        excelCols.add(new ExcelCol("总产量","totalQuantity",20));
+
+        String titleName = "烘房产量统计报表";
+        SXSSFWorkbook workbook = null;
+
+        try {
+            //设置响应头
+            response.setHeader("Content-disposition",
+                    "attachment; filename="+ titleName);
+            response.setContentType("application/octet-stream;charset=UTF-8");
+            ServletOutputStream outputStream = response.getOutputStream();
+            //调用工具类
+            workbook = ExcelMapUtil.initWorkbook(titleName, null, excelCols, list);
+            workbook.write(outputStream);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }finally {
+            if (workbook!=null){
+                workbook.dispose();
+            }
+        }
+    }
 }

op-modules/op-mes/src/main/java/com/op/mes/domain/HFProduction.java

@@ -0,0 +1,83 @@
+package com.op.mes.domain;
+
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+import com.op.mes.domain.vo.DynamicColumnVo;
+
+import java.util.List;
+
+/**
+ *
+ * @author Open Platform
+ * @date 2024-12-12
+ */
+public class HFProduction extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    @Excel(name = "日期")
+    private String ymd;
+    @Excel(name = "烘房编码")
+    private String equCode;
+    @Excel(name = "烘房名称")
+    private String equName;
+    @Excel(name = "产量")
+    private String quality;
+    private String ymArrayStart;
+    private String ymArrayEnd;
+    private List<DynamicColumnVo> equNames;
+
+    public List<DynamicColumnVo> getEquNames() {
+        return equNames;
+    }
+
+    public void setEquNames(List<DynamicColumnVo> equNames) {
+        this.equNames = equNames;
+    }
+
+    public String getYmd() {
+        return ymd;
+    }
+
+    public void setYmd(String ymd) {
+        this.ymd = ymd;
+    }
+
+    public String getEquCode() {
+        return equCode;
+    }
+
+    public void setEquCode(String equCode) {
+        this.equCode = equCode;
+    }
+
+    public String getEquName() {
+        return equName;
+    }
+
+    public void setEquName(String equName) {
+        this.equName = equName;
+    }
+
+    public String getQuality() {
+        return quality;
+    }
+
+    public void setQuality(String quality) {
+        this.quality = quality;
+    }
+
+    public String getYmArrayStart() {
+        return ymArrayStart;
+    }
+
+    public void setYmArrayStart(String ymArrayStart) {
+        this.ymArrayStart = ymArrayStart;
+    }
+
+    public String getYmArrayEnd() {
+        return ymArrayEnd;
+    }
+
+    public void setYmArrayEnd(String ymArrayEnd) {
+        this.ymArrayEnd = ymArrayEnd;
+    }
+}

op-modules/op-mes/src/main/java/com/op/mes/domain/MesInspectionReport.java

@@ -3,6 +3,11 @@ package com.op.mes.domain;
 import com.op.common.core.annotation.Excel;
 import com.op.common.core.web.domain.BaseEntity;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+
 //MES自检互检
 public class MesInspectionReport extends BaseEntity {
     private static final long serialVersionUID = 1L;
@@ -45,7 +50,7 @@ public class MesInspectionReport extends BaseEntity {
     private String productDate;
 
     @Excel(name = "检查日期")
-    private String checkDate;
+    private Date checkDate;
 
     @Excel(name = "产品编码")
     private String productCode;
@@ -67,6 +72,8 @@ public class MesInspectionReport extends BaseEntity {
 
     //项目名
     private String projectName;
+    //项目名
+    private String projectCode;
 
     //线体名
     private String lineName;
@@ -78,12 +85,6 @@ public class MesInspectionReport extends BaseEntity {
     //班组
     private String team;
 
-    //动态增加字段
-//    private Map<String,String> dynamicTime;
-//
-//    public void setDynamicTime(String dynamicTimeName, String value) { dynamicTime.put(dynamicTimeName,value); }
-//    public String getDynamicTime(String dynamicTimeName) { return dynamicTime.get(dynamicTimeName); }
-
 
     public void setId(String id) { this.id = id; }
     public String getId() { return id; }
@@ -121,8 +122,8 @@ public class MesInspectionReport extends BaseEntity {
     public void setProductDate(String productDate) { this.productDate = productDate; }
     public String getProductDate() { return productDate; }
 
-    public void setCheckDate(String checkDate) { this.checkDate = checkDate; }
-    public String getCheckDate() { return checkDate; }
+    public void setCheckDate(Date checkDate) { this.checkDate = checkDate; }
+    public Date getCheckDate() { return checkDate; }
 
     public void setProductCode(String productCode) { this.productCode = productCode; }
     public String getProductCode() { return productCode; }
@@ -145,6 +146,9 @@ public class MesInspectionReport extends BaseEntity {
     public void setProjectName(String projectName) { this.projectName = projectName; }
     public String getProjectName() { return projectName; }
 
+    public void setProjectCode(String projectCode) { this.projectCode = projectCode; }
+    public String getProjectCode() { return projectCode; }
+
     public void setOpenLine(String openLine) { this.openLine = openLine; }
     public String getOpenLine() { return openLine; }
 
@@ -156,4 +160,129 @@ public class MesInspectionReport extends BaseEntity {
 
     public void setLineName(String lineName) { this.lineName = lineName; }
     public String getLineName() { return lineName; }
+
+    private Integer row;//行
+    private Integer col;//列
+    private String type;//项目名、日期、对错号码
+    private String data;
+    private Date time;
+
+    // row的set和get方法
+    public void setRow(Integer row) {
+        this.row = row;
+    }
+
+    public Integer getRow() {
+        return row;
+    }
+
+    // col的set和get方法
+    public void setCol(Integer col) {
+        this.col = col;
+    }
+
+    public Integer getCol() {
+        return col;
+    }
+
+    // type的set和get方法
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    // data的set和get方法
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    // time的set和get方法
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    //产线列表
+    public List<ProOrderWorkorder> productList;
+    //日期码列表
+    public List<ProOrderWorkorder> dateCodeList;
+
+    // productList的get方法
+    public List<ProOrderWorkorder> getProductList() {
+        return productList;
+    }
+
+    // productList的set方法
+    public void setProductList(List<ProOrderWorkorder> productList) {
+        this.productList = productList;
+    }
+
+    // dateCodeList的get方法
+    public List<ProOrderWorkorder> getDateCodeList() {
+        return dateCodeList;
+    }
+
+    // dateCodeList的set方法
+    public void setDateCodeList(List<ProOrderWorkorder> dateCodeList) {
+        this.dateCodeList = dateCodeList;
+    }
+
+    private String workorderId;//工单号
+    // get方法，用于获取工单号的值
+    public String getWorkorderId() {
+        return workorderId;
+    }
+
+    // set方法，用于设置工单号的值
+    public void setWorkorderId(String workorderId) {
+        this.workorderId = workorderId;
+    }
+
+    private ArrayList<LinkedHashMap<String, LinkedHashMap<String, Object>>> tableData;
+
+    public ArrayList<LinkedHashMap<String, LinkedHashMap<String, Object>>> getTableData() {
+        return tableData;
+    }
+
+    public void setTableData(ArrayList<LinkedHashMap<String, LinkedHashMap<String, Object>>> tableData) {
+        this.tableData = tableData;
+    }
+
+    private String factoryCode;
+
+    // row的set和get方法
+    public void setFactoryCode(String factoryCode) {
+        this.factoryCode = factoryCode;
+    }
+
+    public String getFactoryCode() {
+        return factoryCode;
+    }
+
+    private Boolean whetherOpenLine;//是开线还是清换线 开线是1 清换线是0
+    public void setWhetherOpenLine(Boolean whetherOpenLine) {
+        this.whetherOpenLine = whetherOpenLine;
+    }
+    public Boolean getWhetherOpenLine() {
+        return whetherOpenLine;
+    }
+
+    //点检
+    private ArrayList<LinkedHashMap<String, Object>> pointTableData;
+    public ArrayList<LinkedHashMap<String, Object>> getPointTableData() {
+        return pointTableData;
+    }
+    public void setPointTableData(ArrayList<LinkedHashMap<String, Object>> pointTableData) {
+        this.pointTableData = pointTableData;
+    }
 }

op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java

@@ -175,6 +175,33 @@ public class MesPrepare extends BaseEntity {
     private String factoryCode;
     private String prodLineCode;
     private String dayStr;
+    private String recoil;
+    private String ymArrayStart;
+    private String ymArrayEnd;
+
+    public String getYmArrayStart() {
+        return ymArrayStart;
+    }
+
+    public void setYmArrayStart(String ymArrayStart) {
+        this.ymArrayStart = ymArrayStart;
+    }
+
+    public String getYmArrayEnd() {
+        return ymArrayEnd;
+    }
+
+    public void setYmArrayEnd(String ymArrayEnd) {
+        this.ymArrayEnd = ymArrayEnd;
+    }
+
+    public String getRecoil() {
+        return recoil;
+    }
+
+    public void setRecoil(String recoil) {
+        this.recoil = recoil;
+    }
 
     public String getProdLineCode() {
         return prodLineCode;

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesInspectionReportMapper.java

@@ -1,18 +1,30 @@
 package com.op.mes.mapper;
 
 import com.op.mes.domain.MesInspectionReport;
+import com.op.mes.domain.ProOrderWorkorder;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface MesInspectionReportMapper {
     List<MesInspectionReport> selectSelfMutualInspectionList(MesInspectionReport mesInspectionReport);//查询自检互检列表
-    List<String> selectProjectName(String param);//自检互检左侧项目
-    List<String> selectTimeArray(MesInspectionReport mesInspectionReport);//查询所有时间
+    List<MesInspectionReport> selectProjectName(String param);//自检互检左侧项目
+    List<MesInspectionReport> selectTimeArray(MesInspectionReport mesInspectionReport);//查询所有时间
     MesInspectionReport selectSelfMutualInspectionData(MesInspectionReport mesInspectionReport);
     List<MesInspectionReport> getLineCodeList();
 
     List<MesInspectionReport> selectPointInspectionProjectList(String param);//点检项目
     List<String> selectTeamArray(MesInspectionReport mesInspectionReport);//班组
+    List<MesInspectionReport> getProductList(MesInspectionReport mesInspectionReport);//查询产品列表
+    List<ProOrderWorkorder> getDataCodeList(MesInspectionReport data);
 
-    List<MesInspectionReport> selectCheckBoxList(MesInspectionReport mesInspectionReport);
+    void updateHeaderFooter(MesInspectionReport mesInspectionReport);
+
+    void updateTableBody(MesInspectionReport mesInspectionReport);
+
+    void updateBatch(@Param("list")List<MesInspectionReport> updateList);
+
+    void addBatch(@Param("list")List<MesInspectionReport> updateList);
+
+    List<ProOrderWorkorder> getWorkList(MesInspectionReport mesInspectionReport);
 }

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.mes.domain.MesPrepare;
+import com.op.system.api.domain.quality.QcCheckTaskDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -71,4 +72,8 @@ public interface MesPrepareMapper {
      * @return
      */
     MesPrepare selectMesPrepareByCode(String workorderCode);
+
+    List<MesPrepare> getBomTraceList(MesPrepare mesPrepare);
+
+    List<QcCheckTaskDTO> getCheckTaskTraceList(QcCheckTaskDTO dto);
 }

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java

@@ -8,6 +8,7 @@ import com.op.mes.domain.*;
 import com.op.mes.domain.dto.LineChartSeriesDto;
 import com.op.mes.domain.dto.QuantityDto;
 import com.op.mes.domain.dto.SysFactoryDto;
+import com.op.mes.domain.vo.DynamicColumnVo;
 import com.op.mes.domain.vo.MesDailyReportVo;
 import com.op.mes.domain.vo.MesMonthReportVo;
 import com.op.system.api.domain.SysNoticeGroup;
@@ -214,4 +215,8 @@ public interface MesReportWorkMapper {
     List<ProOrderWorkorder> getWorkList(MesProductTrace qo);
 
     List<ProOrderWorkorder> getWaList(MesProductTrace qo);
+
+    List<HFProduction> getHFProductionList(HFProduction dto);
+
+    List<DynamicColumnVo> getHFProductionTitle(HFProduction dto);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/IMesInspectionReportService.java

@@ -1,6 +1,8 @@
 package com.op.mes.service;
 
+import com.op.common.core.web.domain.AjaxResult;
 import com.op.mes.domain.MesInspectionReport;
+import com.op.mes.domain.ProOrderWorkorder;
 
 import java.util.List;
 
@@ -17,5 +19,11 @@ public interface IMesInspectionReportService {
 
     List<MesInspectionReport> selectPointInspectionList(MesInspectionReport mesInspectionReport);//产品转换/完产清线点检表
 
-    List<MesInspectionReport> selectCheckBoxList(MesInspectionReport mesInspectionReport);//点检上方备选框
+    List<MesInspectionReport> getProductList(MesInspectionReport mesInspectionReport);//查询产线
+
+    AjaxResult updateTable(MesInspectionReport mesInspectionReport);//修改表头 表尾部 表主体
+
+    List<ProOrderWorkorder> getWorkList(MesInspectionReport mesInspectionReport);
+
+    AjaxResult updatePointInspectionTable(MesInspectionReport mesInspectionReport);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/IMesPrepareService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.op.common.core.domain.R;
 import com.op.mes.domain.MesPrepare;
+import com.op.system.api.domain.quality.QcCheckTaskDTO;
 
 /**
  * 备料单Service接口
@@ -66,4 +67,8 @@ public interface IMesPrepareService {
     public R getMesPrepare();
 
     public R reportWorkTask();
+
+    public List<MesPrepare> getBomTraceList(MesPrepare mesPrepare);
+
+    public List<QcCheckTaskDTO> getCheckTaskTraceList(QcCheckTaskDTO dto);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java

@@ -1,10 +1,13 @@
 package com.op.mes.service;
 
 import com.op.common.core.domain.R;
+import com.op.mes.domain.HFProduction;
 import com.op.mes.domain.MesProductTrace;
 import com.op.mes.domain.MesReportWork;
+import com.op.mes.domain.vo.DynamicColumnVo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IMesReportWorksService {
 
@@ -13,4 +16,8 @@ public interface IMesReportWorksService {
     R mesProTask();
 
     List<MesProductTrace> getProductTrace(MesProductTrace dto);
+
+    List<Map<String, Object>> getHFProductionList(HFProduction dto);
+
+    List<DynamicColumnVo> getHFProductionTitle(HFProduction dto);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java

@@ -3,8 +3,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.op.common.core.context.SecurityContextHolder;
+import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.StringUtils;
+import com.op.common.core.utils.uuid.IdUtils;
+import com.op.common.core.web.domain.AjaxResult;
 import com.op.mes.domain.MesInspectionReport;
+import com.op.mes.domain.ProOrderWorkorder;
 import com.op.mes.mapper.MesInspectionReportMapper;
 import com.op.mes.service.IMesInspectionReportService;
 import org.slf4j.Logger;
@@ -26,35 +31,82 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi
     @Override
     @DS("#header.poolName")
     public List selectSelfMutualInspectionList(MesInspectionReport mesInspectionReport) {
-        mesInspectionReport.setReportName("ConversionReport");
+        //mesInspectionReport.setReportName("ConversionReport");
         List<MesInspectionReport> list = mesInspectionReportMapper.selectSelfMutualInspectionList(mesInspectionReport);
         //1.查询左侧边 列 存入
-        String param = "self_mutual_inspection";
-        List<String> projectNames = mesInspectionReportMapper.selectProjectName(param);
-        List<String> timeArray = mesInspectionReportMapper.selectTimeArray(mesInspectionReport);
+        String param = "";
+        if(mesInspectionReport.getReportName().equals("ConversionReport")){
+            param = "self_mutual_inspection";
+        }else if(mesInspectionReport.getReportName().equals("ConversionReportLeft")){
+            param = "first_inspection_left";
+        }
+
+        MesInspectionReport buildDTO = new MesInspectionReport();
+        buildDTO.setCheckTimeS("");
+        buildDTO.setCheckTimeE("");
+
+        List<MesInspectionReport> projectNames = mesInspectionReportMapper.selectProjectName(param);
+        List<MesInspectionReport> timeArray = mesInspectionReportMapper.selectTimeArray(mesInspectionReport);
         List<Object> listDTO = new ArrayList<>();
 
-        for(String projectName : projectNames){
-            Map<String,String> dynamicTime = new LinkedHashMap<>();
-            dynamicTime.put("开始-结束",projectName);
+        for(MesInspectionReport project : projectNames){
+            Map<String,MesInspectionReport> dynamicTime = new LinkedHashMap<>();
+            MesInspectionReport dto = new MesInspectionReport();
+            dto.setData(project.getProjectName());
+            dto.setType("projectName");
+            dto.setProjectName(project.getProjectName());//项目名
+            dto.setProjectCode(project.getProjectCode());//项目编码
+            dynamicTime.put("开始-结束",dto);
+
             if(CollectionUtils.isEmpty(timeArray)){
-                dynamicTime.put("", "");
-                dynamicTime.put(" ", "");
-                dynamicTime.put("   ", "");
+                dynamicTime.put("", new MesInspectionReport());
+                dynamicTime.put(" ", new MesInspectionReport());
+                dynamicTime.put("   ", new MesInspectionReport());
             }else{
-                for(String time : timeArray){
+                for(MesInspectionReport time : timeArray){
                     List<MesInspectionReport> result = list.stream()
-                            .filter(MesInspectionReport -> MesInspectionReport.getTimeArray().equals(time)) // 条件1：符合开始时间结束时间
-                            .filter(MesInspectionReport-> MesInspectionReport.getInfoName().equals(projectName))  // 条件2：符合当前项目名
+                            .filter(MesInspectionReport -> MesInspectionReport.getTimeArray().equals(time.getTimeArray())) // 条件1：符合开始时间结束时间
+                            .filter(MesInspectionReport-> MesInspectionReport.getInfoName().equals(project.getProjectName()))  // 条件2：符合当前项目名
                             .collect(Collectors.toList()); // 收集结果
+
                     if(!CollectionUtils.isEmpty(result)){
                         if(StringUtils.isNotBlank(result.get(0).getCheckResult())){
-                            dynamicTime.put(time, result.get(0).getCheckResult());
+                            if(project.getProjectName().equals("日期码") || project.getProjectName().equals("生产批号")){
+                                result.get(0).setType("dataCode");
+                            }else if(project.getProjectName().equals("灌装量/净含量/喷药量")){
+                                result.get(0).setType("sprayAmount");
+                            }else{
+                                result.get(0).setType("rightWrong");
+                            }
+                            result.get(0).setData(result.get(0).getCheckResult());
+                            dynamicTime.put(time.getTimeArray(), result.get(0));
                         }else{
-                            dynamicTime.put(time, "");
+                            MesInspectionReport result0 = new MesInspectionReport();
+                            if(project.getProjectName().equals("日期码")|| project.getProjectName().equals("生产批号")){
+                                result0.setType("dataCode");
+                            }else if(project.getProjectName().equals("灌装量/净含量/喷药量")){
+                                result0.setType("sprayAmount");
+                            }else{
+                                result0.setType("rightWrong");
+                            }
+                            result0.setCheckTimeS(time.getCheckTimeS());
+                            result0.setCheckTimeE(time.getCheckTimeE());
+                            result0.setTableLine(time.getTableLine());
+                            dynamicTime.put(time.getTimeArray(), result0);
                         }
                     }else{
-                        dynamicTime.put(time, "");
+                        MesInspectionReport result0 = new MesInspectionReport();
+                        if(project.getProjectName().equals("日期码")|| project.getProjectName().equals("生产批号")){
+                            result0.setType("dataCode");
+                        }else if(project.getProjectName().equals("灌装量/净含量/喷药量")){
+                            result0.setType("sprayAmount");
+                        }else{
+                            result0.setType("rightWrong");
+                        }
+                        result0.setCheckTimeS(time.getCheckTimeS());
+                        result0.setCheckTimeE(time.getCheckTimeE());
+                        result0.setTableLine(time.getTableLine());
+                        dynamicTime.put(time.getTimeArray(), result0);
                     }
                 }
             }
@@ -65,17 +117,14 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi
             if(timeArray.size() < 3){
                 for(int i = 0 ; i < 3-(timeArray.size()) ; i++){
                     if(i == 0){
-                        dynamicTime.put(string1, "");
+                        dynamicTime.put(string1,new MesInspectionReport());
                     }else if(i == 1){
-                        dynamicTime.put(string2, "");
+                        dynamicTime.put(string2,new MesInspectionReport());
                     }
                 }
             }
 
-
             String s = JSON.toJSONString(dynamicTime);
-//            Object object = JSON.parseObject(s, Object.class);
-//            LinkedHashMap<String, Object> linkedMap = JSON.parseObject(s, LinkedHashMap.class);
             JSONObject object = JSONObject.parseObject(s, Feature.OrderedField);
             log.info("动态添加属性： = {}",object);
             listDTO.add(object);
@@ -84,11 +133,88 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi
         return listDTO;
     }
 
+    @Override
+    @DS("#header.poolName")
+    //修改表头部和表尾部
+    public AjaxResult updateTable(MesInspectionReport mesInspectionReport) {
+        mesInspectionReport.setUpdateBy(SecurityContextHolder.getUserName());
+        mesInspectionReport.setUpdateTime(DateUtils.getNowDate());
+        //更新表头和表尾 也就是数据库的主表内容
+        mesInspectionReport.setCreateBy(StringUtils.isBlank(mesInspectionReport.getCreateBy())?
+                                SecurityContextHolder.getUserName() : mesInspectionReport.getCreateBy());
+        mesInspectionReportMapper.updateHeaderFooter(mesInspectionReport);
+
+        //需要新增的
+        List<MesInspectionReport> addList = new ArrayList<>();
+        //需要修改的
+        List<MesInspectionReport> updateList = new ArrayList<>();
+
+        ArrayList<LinkedHashMap<String, LinkedHashMap<String, Object>>> tableData = mesInspectionReport.getTableData();
+        if (tableData!= null) {
+            for (LinkedHashMap<String, LinkedHashMap<String, Object>> item : tableData) {
+                //提取出来开始结束那一行数据的 项目名字
+                String projectName = (String) item.get("开始-结束").get("projectName");
+                String projectCode = (String) item.get("开始-结束").get("projectCode");
+
+                for (Map.Entry<String, LinkedHashMap<String, Object>> entry : item.entrySet()) {
+                    if(!entry.getKey().equals("开始-结束")){
+                        LinkedHashMap<String, Object> innerMap = entry.getValue();
+                        String dataValue = (String) innerMap.get("data");
+                        String idValue = (String) innerMap.get("id");
+                        String checkTimeS = (String) innerMap.get("checkTimeS");
+                        String checkTimeE = (String) innerMap.get("checkTimeE");
+                        Integer tableLine = (Integer) innerMap.get("tableLine"); //实际上是列的意思
+
+                        //如果是新的需要插入的值 ，那么说明没有id
+                        if(StringUtils.isBlank(idValue) && StringUtils.isNotBlank(dataValue)){
+                            MesInspectionReport addDto = new MesInspectionReport();
+                            addDto.setId(IdUtils.fastSimpleUUID());//自动生成id
+                            addDto.setBelongTo(mesInspectionReport.getId());//主表id
+                            addDto.setInfoCode(projectCode);
+                            addDto.setInfoName(projectName);
+                            addDto.setCreateTime(DateUtils.getNowDate());
+                            addDto.setCreateBy(SecurityContextHolder.getUserName());
+                            addDto.setCheckResult(dataValue);
+                            addDto.setCheckTimeS(checkTimeS);
+                            addDto.setCheckTimeE(StringUtils.isBlank(checkTimeE)? "" : checkTimeE);
+                            addDto.setTableLine(tableLine);
+                            addDto.setDelFlag("0");
+                            addList.add(addDto);
+                        }else if(StringUtils.isNotBlank(idValue) && StringUtils.isNotBlank(dataValue)){
+                            MesInspectionReport updateDto = new MesInspectionReport();
+                            updateDto.setId(idValue);
+                            updateDto.setUpdateBy(SecurityContextHolder.getUserName());
+                            updateDto.setUpdateTime(DateUtils.getNowDate());
+                            updateDto.setCheckResult(dataValue);
+                            updateDto.setCheckTimeS(checkTimeS);
+                            updateDto.setCheckTimeE(StringUtils.isBlank(checkTimeE)? "" : checkTimeE);
+                            updateList.add(updateDto);
+                        }
+                    }
+                }
+            }
+        }
+
+        //更新表的主体部分 也就是数据库的子表
+        if(updateList.size() > 0 ){
+            mesInspectionReportMapper.updateBatch(updateList);
+        }
+
+        if(addList.size() >0){
+            mesInspectionReportMapper.addBatch(addList);
+        }
+
+        return AjaxResult.success();
+    }
+
     @Override
     @DS("#header.poolName")
     public MesInspectionReport selfMutualInspectionData(MesInspectionReport mesInspectionReport) {
-        //'ConversionReport'
         MesInspectionReport data = mesInspectionReportMapper.selectSelfMutualInspectionData(mesInspectionReport);
+        if(mesInspectionReport.getWorkorderId() != null){
+            List<ProOrderWorkorder> dateCodeList = mesInspectionReportMapper.getDataCodeList(mesInspectionReport);
+            data.setDateCodeList(dateCodeList);
+        }
         return data;
     }
 
@@ -99,50 +225,57 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi
         return list;
     }
 
+    @Override
+    @DS("#header.poolName")
+    public List<MesInspectionReport> getProductList(MesInspectionReport mesInspectionReport) {
+        List<MesInspectionReport> productList = mesInspectionReportMapper.getProductList(mesInspectionReport);
+        return productList;
+    }
+
+    @Override
+    @DS("#header.poolName")
+    public List<ProOrderWorkorder> getWorkList(MesInspectionReport mesInspectionReport) {
+        List<ProOrderWorkorder> workList = mesInspectionReportMapper.getWorkList(mesInspectionReport);
+        return workList;
+    }
+
+
+    ////////左右报表都不需要
     //首检左报表
     @Override
     @DS("#header.poolName")
     public List selectFirstInspectionLeftList(MesInspectionReport mesInspectionReport) {
-        //0.时间处理
-//        if(mesInspectionReport.getCheckDate() != null){
-//            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置格式
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.add(Integer.valueOf(mesInspectionReport.getCheckDate()), -1); //当前时间减去一天，即一天前的时间
-//            String checkDate = simpleDateFormat.format(calendar.getTime());
-//            mesInspectionReport.setCheckDate(checkDate);
-//        }
-
         // 1.报表名
         mesInspectionReport.setReportName("ConversionReportLeft");
         List<MesInspectionReport> list = mesInspectionReportMapper.selectSelfMutualInspectionList(mesInspectionReport);
         //2..查询左侧边 列 存入
         String param = "first_inspection_left";
-        List<String> projectNames = mesInspectionReportMapper.selectProjectName(param);
+        List<MesInspectionReport> projectNames = mesInspectionReportMapper.selectProjectName(param);
 
-        List<String> timeArray = mesInspectionReportMapper.selectTimeArray(mesInspectionReport);
+        List<MesInspectionReport> timeArray = mesInspectionReportMapper.selectTimeArray(mesInspectionReport);
         List<Object> listDTO = new ArrayList<>();
 
-        for(String projectName : projectNames){
+        for(MesInspectionReport project : projectNames){
             Map<String,String> dynamicTime = new LinkedHashMap<>();
-            dynamicTime.put("开始-结束",projectName);
+            dynamicTime.put("开始-结束",project.getProjectName());
             if(CollectionUtils.isEmpty(timeArray)){
                 dynamicTime.put("", "");
                 dynamicTime.put(" ", "");
                 dynamicTime.put("  ", "");
             }else{
-                for(String time : timeArray){
+                for(MesInspectionReport time : timeArray){
                     List<MesInspectionReport> result = list.stream()
-                            .filter(MesInspectionReport -> MesInspectionReport.getTimeArray().equals(time)) // 条件1：符合开始时间结束时间
-                            .filter(MesInspectionReport-> MesInspectionReport.getInfoName().equals(projectName))  // 条件2：符合当前项目名
+                            .filter(MesInspectionReport -> MesInspectionReport.getTimeArray().equals(time.getTimeArray())) // 条件1：符合开始时间结束时间
+                            .filter(MesInspectionReport-> MesInspectionReport.getInfoName().equals(project.getProjectName()))  // 条件2：符合当前项目名
                             .collect(Collectors.toList()); // 收集结果
                     if(!CollectionUtils.isEmpty(result)){
                         if(StringUtils.isNotBlank(result.get(0).getCheckResult())){
-                            dynamicTime.put(time, result.get(0).getCheckResult());
+                            dynamicTime.put(time.getTimeArray(), result.get(0).getCheckResult());
                         }else{
-                            dynamicTime.put(time, "");
+                            dynamicTime.put(time.getTimeArray(), "");
                         }
                     }else{
-                        dynamicTime.put(time, "");
+                        dynamicTime.put(time.getTimeArray(), "");
                     }
                 }
             }
@@ -176,32 +309,32 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi
         List<MesInspectionReport> list = mesInspectionReportMapper.selectSelfMutualInspectionList(mesInspectionReport);
         //2..查询左侧边 列 存入
         String param = "first_inspection_right";
-        List<String> projectNames = mesInspectionReportMapper.selectProjectName(param);
+        List<MesInspectionReport> projectNames = mesInspectionReportMapper.selectProjectName(param);
 
-        List<String> timeArray = mesInspectionReportMapper.selectTimeArray(mesInspectionReport);
+        List<MesInspectionReport> timeArray = mesInspectionReportMapper.selectTimeArray(mesInspectionReport);
         List<Object> listDTO = new ArrayList<>();
 
-        for(String projectName : projectNames){
+        for(MesInspectionReport project : projectNames){
             Map<String,String> dynamicTime = new LinkedHashMap<>();
-            dynamicTime.put("开始-结束",projectName);
+            dynamicTime.put("开始-结束",project.getProjectName());
             if(CollectionUtils.isEmpty(timeArray)){
                 dynamicTime.put("", "");
                 dynamicTime.put(" ", "");
                 dynamicTime.put("  ", "");
             }else{
-                for(String time : timeArray){
+                for(MesInspectionReport time : timeArray){
                     List<MesInspectionReport> result = list.stream()
-                            .filter(MesInspectionReport -> MesInspectionReport.getTimeArray().equals(time)) // 条件1：符合开始时间结束时间
-                            .filter(MesInspectionReport-> MesInspectionReport.getInfoName().equals(projectName))  // 条件2：符合当前项目名
+                            .filter(MesInspectionReport -> MesInspectionReport.getTimeArray().equals(time.getTimeArray())) // 条件1：符合开始时间结束时间
+                            .filter(MesInspectionReport-> MesInspectionReport.getInfoName().equals(project.getProjectName()))  // 条件2：符合当前项目名
                             .collect(Collectors.toList()); // 收集结果
                     if(!CollectionUtils.isEmpty(result)){
                         if(StringUtils.isNotBlank(result.get(0).getCheckResult())){
-                            dynamicTime.put(time, result.get(0).getCheckResult());
+                            dynamicTime.put(time.getTimeArray(), result.get(0).getCheckResult());
                         }else{
-                            dynamicTime.put(time, "");
+                            dynamicTime.put(time.getTimeArray(), "");
                         }
                     }else{
-                        dynamicTime.put(time, "");
+                        dynamicTime.put(time.getTimeArray(), "");
                     }
                 }
             }
@@ -239,19 +372,42 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi
 
         List<String> teamArray = mesInspectionReportMapper.selectTeamArray(mesInspectionReport);
         List<Object> listDTO = new ArrayList<>();
+        MesInspectionReport buildDTO = new MesInspectionReport();
+        buildDTO.setId("");
+        buildDTO.setRemark("");
+        buildDTO.setCheckResult("");
+        buildDTO.setBelongTo(mesInspectionReport.getId());
+        buildDTO.setWhetherOpenLine(null);
 
         for(MesInspectionReport project : projectList){
-            Map<String,String> dynamicRow = new LinkedHashMap<>();
-            dynamicRow.put("序号",project.getTableLine() + "");
-            dynamicRow.put("点检项目",project.getProjectName());
-            dynamicRow.put("点检内容",project.getInfoName());
+            Map<String,MesInspectionReport> dynamicRow = new LinkedHashMap<>();
+
+            MesInspectionReport buildDTO1 = new MesInspectionReport();
+            buildDTO1.setData(project.getTableLine() + "");
+            dynamicRow.put("序号",buildDTO1);
+
+            MesInspectionReport buildDTO2 = new MesInspectionReport();
+            buildDTO2.setData(project.getProjectName());
+            dynamicRow.put("点检项目",buildDTO2);
+
+            MesInspectionReport buildDTO3 = new MesInspectionReport();
+            buildDTO3.setData(project.getInfoName());
+            dynamicRow.put("点检内容",buildDTO3);
+
             if(CollectionUtils.isEmpty(teamArray)){
-                dynamicRow.put("", "");
-                dynamicRow.put(" ", "");
-                dynamicRow.put("  ", "");
-                dynamicRow.put("   ", "");
-                dynamicRow.put("    ", "");
-                dynamicRow.put("     ", "");
+                buildDTO.setTableLine(1);
+                dynamicRow.put("第1列", buildDTO);
+                buildDTO.setTableLine(2);
+                dynamicRow.put("第2列", buildDTO);
+                buildDTO.setTableLine(3);
+                dynamicRow.put("第3列", buildDTO);
+                buildDTO.setTableLine(4);
+                dynamicRow.put("第4列", buildDTO);
+                buildDTO.setTableLine(5);
+                dynamicRow.put("第5列", buildDTO);
+                buildDTO.setTableLine(6);
+                dynamicRow.put("第6列", buildDTO);
+
             }else{
                 for(String team : teamArray){
                     List<MesInspectionReport> result = list.stream()
@@ -260,32 +416,40 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi
                             .collect(Collectors.toList()); // 收集结果
                     if(!CollectionUtils.isEmpty(result)){
                         if(StringUtils.isNotBlank(result.get(0).getCheckResult())){
-                            dynamicRow.put(team, result.get(0).getCheckResult());
+                            result.get(0).setWhetherOpenLine( result.get(0).getBz().equals("1") ? true : false);
+                            dynamicRow.put(team, result.get(0));
                         }else{
-                            dynamicRow.put(team, "");
+                            result.get(0).setWhetherOpenLine( result.get(0).getBz().equals("1") ? true : false);
+                            dynamicRow.put(team, result.get(0));
                         }
                     }else{
-                        dynamicRow.put(team, "");
+                        dynamicRow.put(team, buildDTO);
                     }
                 }
             }
 
             if(teamArray.size() < 6){
-                for(int i = 0 ; i < 6-(teamArray.size()) ; i++){
+                for(int i = 0 ; i < 6 - (teamArray.size()) ; i++){
+
                     if(i == 0){
-                        dynamicRow.put("", "");
+                        buildDTO.setTableLine(teamArray.size() + 1);
+                        dynamicRow.put("第"+ (teamArray.size()+1)+"列", buildDTO);
                     }else if(i == 1){
-                        dynamicRow.put(" ", "");
+                        buildDTO.setTableLine(teamArray.size() + 2);
+                        dynamicRow.put("第"+(teamArray.size()+2)+"列", buildDTO);
                     }else if(i == 2){
-                        dynamicRow.put("  ", "");
+                        buildDTO.setTableLine(teamArray.size() + 3);
+                        dynamicRow.put("第"+(teamArray.size()+3)+"列", buildDTO);
                     }else if(i == 3){
-                        dynamicRow.put("   ", "");
+                        buildDTO.setTableLine(teamArray.size() + 4);
+                        dynamicRow.put("第"+(teamArray.size()+4)+"列", buildDTO);
                     }else if(i == 4){
-                        dynamicRow.put("    ", "");
+                        buildDTO.setTableLine(teamArray.size() + 5);
+                        dynamicRow.put("第"+(teamArray.size()+5)+"列", buildDTO);
                     }else if(i == 5){
-                        dynamicRow.put("     ", "");
+                        buildDTO.setTableLine(teamArray.size() + 6);
+                        dynamicRow.put("第"+(teamArray.size() + 6)+"列", buildDTO);
                     }
-
                 }
             }
 
@@ -298,101 +462,74 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi
         return listDTO;
     }
 
-    //点检上半部分数据
     @Override
     @DS("#header.poolName")
-    public List selectCheckBoxList(MesInspectionReport mesInspectionReport) {
-        List<Object> listDTO = new ArrayList<>();
-        //1.报表名
-        mesInspectionReport.setReportName("CheckReport");
-        List<MesInspectionReport> lists = mesInspectionReportMapper.selectCheckBoxList(mesInspectionReport);
-
-        Map<String,Map<String,Boolean>> dynamicRow1 = new LinkedHashMap<>();
-        Map<String,String> dynamicRow2 = new LinkedHashMap<>();
-        String str = "str";
-        int i = 0;
-        for(MesInspectionReport list :lists){
-            Map<String,Boolean> dynamicRow10 = new LinkedHashMap<>();
-            if(list.getBz().equals("1")){
-                dynamicRow10.put("openLine",Boolean.TRUE);
-                dynamicRow10.put("clearLine",Boolean.FALSE);
-                dynamicRow1.put(str + i + "",dynamicRow10);
-            }else{
-                dynamicRow10.put("clearLine",Boolean.TRUE);
-                dynamicRow10.put("openLine",Boolean.FALSE);
-                dynamicRow1.put(str + i + "",dynamicRow10);
-            }
-
-            dynamicRow2.put(str + i + "","班次:" + list.getRemark());
-            i++;
-        }
-        if(lists == null){
-            Map<String,Boolean> dynamicRow10 = new LinkedHashMap<>();
-            dynamicRow10.put("openLine",Boolean.FALSE);
-            dynamicRow10.put("clearLine",Boolean.FALSE);
-            dynamicRow1.put(str + 0 + "", dynamicRow10);
-            dynamicRow1.put(str + 1 + "", dynamicRow10);
-            dynamicRow1.put(str + 2 + "", dynamicRow10);
-            dynamicRow1.put(str + 3 + "", dynamicRow10);
-            dynamicRow1.put(str + 4 + "", dynamicRow10);
-            dynamicRow1.put(str + 5 + "", dynamicRow10);
-
-            dynamicRow2.put(str + 0 + "", "班次:");
-            dynamicRow2.put(str + 1 + "", "班次:");
-            dynamicRow2.put(str + 2 + "", "班次:");
-            dynamicRow2.put(str + 3 + "", "班次:");
-            dynamicRow2.put(str + 4 + "", "班次:");
-            dynamicRow2.put(str + 5 + "", "班次:");
-        }
-
-            if(dynamicRow1.size() < 6){
-                for(int j = 0 ; j < 6-(lists.size()) ; j++){
-                    Map<String,Boolean> dynamicRow10 = new LinkedHashMap<>();
-                    dynamicRow10.put("openLine",Boolean.FALSE);
-                    dynamicRow10.put("clearLine",Boolean.FALSE);
-                    if(j == 0){
-                        dynamicRow1.put(str + 5  +"", dynamicRow10);
-                    }else if(j == 1){
-                        dynamicRow1.put(str + 4  +"", dynamicRow10);
-                    }else if(j == 2){
-                        dynamicRow1.put(str + 3  +"", dynamicRow10);
-                    }else if(j == 3){
-                        dynamicRow1.put(str + 2  +"", dynamicRow10);
-                    }else if(j == 4){
-                        dynamicRow1.put(str + 1  +"", dynamicRow10);
-                    }else if(j == 5){
-                        dynamicRow1.put(str + 0  +"", dynamicRow10);
+    //修改表头部和表尾部
+    public AjaxResult updatePointInspectionTable(MesInspectionReport mesInspectionReport) {
+        mesInspectionReport.setUpdateBy(SecurityContextHolder.getUserName());
+        mesInspectionReport.setUpdateTime(DateUtils.getNowDate());
+        mesInspectionReportMapper.updateHeaderFooter(mesInspectionReport);//修改主表
+
+        //需要新增的
+        List<MesInspectionReport> addList = new ArrayList<>();
+        //需要修改的
+        List<MesInspectionReport> updateList = new ArrayList<>();
+        ArrayList<LinkedHashMap<String, LinkedHashMap<String, Object>>> tableData = mesInspectionReport.getTableData();
+        if (tableData!= null) {
+            for (LinkedHashMap<String, LinkedHashMap<String, Object>> item : tableData) {
+                //提取出来开始结束那一行数据的 项目名字
+                String infoName = (String) item.get("点检内容").get("data");
+
+                for (Map.Entry<String, LinkedHashMap<String, Object>> entry : item.entrySet()) {
+                    if(!entry.getKey().equals("序号") && !entry.getKey().equals("点检内容") && !entry.getKey().equals("点检项目")){
+                        LinkedHashMap<String, Object> innerMap = entry.getValue();
+
+                        String id = (String) innerMap.get("id");
+                        String checkResult = (String) innerMap.get("checkResult");
+                        Boolean whetherOpenLine = (Boolean) innerMap.get("whetherOpenLine");
+                        String remark = (String) innerMap.get("remark");
+                        String belongTo = (String) innerMap.get("belongTo");
+                        Integer tableLine = (Integer) innerMap.get("tableLine");
+
+                        if(StringUtils.isNotBlank(id) && StringUtils.isNotBlank(checkResult)){
+                            MesInspectionReport updateDto = new MesInspectionReport();
+                            updateDto.setId(id);
+                            updateDto.setUpdateBy(SecurityContextHolder.getUserName());
+                            updateDto.setUpdateTime(DateUtils.getNowDate());
+                            updateDto.setCheckResult(checkResult);
+                            updateDto.setBz(whetherOpenLine == true ? "1": "0");
+                            updateDto.setRemark(remark);
+                            updateList.add(updateDto);
+                        }else if(StringUtils.isBlank(id) && StringUtils.isNotBlank(checkResult)){
+                            MesInspectionReport addDto = new MesInspectionReport();
+                            addDto.setId(IdUtils.fastSimpleUUID());
+                            addDto.setBelongTo(StringUtils.isNotBlank(belongTo)? belongTo: mesInspectionReport.getId());
+                            addDto.setCreateBy(SecurityContextHolder.getUserName());
+                            addDto.setCreateTime(DateUtils.getNowDate());
+                            addDto.setUpdateBy(SecurityContextHolder.getUserName());
+                            addDto.setUpdateTime(DateUtils.getNowDate());
+                            addDto.setCheckResult(checkResult);
+                            addDto.setBz(whetherOpenLine == true ? "1": "0");
+                            addDto.setDelFlag("0");
+                            addDto.setRemark(remark);
+                            addDto.setInfoName(infoName);
+                            addDto.setTableLine(tableLine);
+                            addList.add(addDto);
+                        }
                     }
                 }
             }
+        }
 
-        if(dynamicRow2.size() < 6){
-            for(int j = 0 ; j < 6-(lists.size()) ; j++){
-                if(j == 0){
-                    dynamicRow2.put(str + 5  +"", "班次:");
-                }else if(j == 1){
-                    dynamicRow2.put(str + 4  +"", "班次:");
-                }else if(j == 2){
-                    dynamicRow2.put(str + 3  +"", "班次:");
-                }else if(j == 3){
-                    dynamicRow2.put(str + 2  +"", "班次:");
-                }else if(j == 4){
-                    dynamicRow2.put(str + 1  +"", "班次:");
-                }else if(j == 5){
-                    dynamicRow2.put(str + 0  +"", "班次:");
-                }
-            }
+        //更新表的主体部分 也就是数据库的子表
+        if(updateList.size() > 0 ){
+            mesInspectionReportMapper.updateBatch(updateList);
         }
 
-            String s1 = JSON.toJSONString(dynamicRow1);
-            String s2 = JSON.toJSONString(dynamicRow2);
-            JSONObject object1 = JSONObject.parseObject(s1, Feature.OrderedField);
-            JSONObject object2 = JSONObject.parseObject(s2, Feature.OrderedField);
-            log.info("点检动态添加属性： = {}",object1);
-            log.info("点检动态添加属性： = {}",object2);
-            listDTO.add(object1);
-            listDTO.add(object2);
-        log.info("点检动态添加属性： = {}", JSON.toJSONString(listDTO));
-        return listDTO;
+        if(addList.size() >0){
+            mesInspectionReportMapper.addBatch(addList);
+        }
+
+        return AjaxResult.success();
     }
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareServiceImpl.java

@@ -20,6 +20,7 @@ import com.op.mes.mapper.MesReportWorkMapper;
 import com.op.system.api.RemoteSapService;
 import com.op.system.api.RemoteUserService;
 import com.op.system.api.domain.SysUser;
+import com.op.system.api.domain.quality.QcCheckTaskDTO;
 import com.op.system.api.domain.sap.SapMaterialPreparation;
 import com.op.system.api.domain.sap.SapRFW;
 import org.slf4j.Logger;
@@ -303,4 +304,15 @@ public class MesPrepareServiceImpl implements IMesPrepareService {
         Set<String> orderCodes = list.stream().map(SapMaterialPreparation::getAUFNR).collect(Collectors.toSet());
         System.out.println(JSON.toJSONString(orderCodes));
     }
+
+    @Override
+    @DS("#header.poolName")
+    public List<MesPrepare> getBomTraceList(MesPrepare mesPrepare) {
+        return mesPrepareMapper.getBomTraceList(mesPrepare);
+    }
+    @Override
+    @DS("#header.poolName")
+    public List<QcCheckTaskDTO> getCheckTaskTraceList(QcCheckTaskDTO dto) {
+        return mesPrepareMapper.getCheckTaskTraceList(dto);
+    }
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java

@@ -2,6 +2,7 @@ package com.op.mes.service.impl;
 
 
 import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.domain.R;
@@ -9,9 +10,8 @@ import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.StringUtils;
 import com.op.common.core.utils.bean.BeanUtils;
 import com.op.common.core.web.domain.AjaxResult;
-import com.op.mes.domain.MesProductTrace;
-import com.op.mes.domain.MesReportWork;
-import com.op.mes.domain.ProOrderWorkorder;
+import com.op.mes.domain.*;
+import com.op.mes.domain.vo.DynamicColumnVo;
 import com.op.mes.mapper.MesReportWorkMapper;
 import com.op.mes.mapper.MesReportWorksMapper;
 import com.op.mes.service.IMesReportWorksService;
@@ -27,6 +27,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -147,6 +149,7 @@ public class MesReportWorksServiceImpl implements IMesReportWorksService {
         }
         return dtos;
     }
+
     public void setMesProInfoFunc(String poolName){
         DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
         //工厂名称
@@ -199,4 +202,77 @@ public class MesReportWorksServiceImpl implements IMesReportWorksService {
             //发企业微信--------------------结束
         }
     }
+
+    @Override
+    @DS("#header.poolName")
+    public List<Map<String, Object>> getHFProductionList(HFProduction dto) {
+        //return mesReportWorkMapper.getHFProductionList(dto);
+        // 开始日期
+        String start = dto.getYmArrayStart();
+        String end = dto.getYmArrayEnd();
+        // 查询出来时间区间
+        List<String> listDate = getDateInterval(start,end);
+        List<DynamicColumnVo> allEquNames = dto.getEquNames();
+
+        List<HFProduction> dbMProductList = mesReportWorkMapper.getHFProductionList(dto);
+
+        List<Map<String, Object>> results = listDate.stream()
+                .map(date -> {
+                    Map<String, Object> row = new HashMap<>();
+                    row.put("ymd", date);
+
+                    //对于每个日期，收集该日期下所有产品的产量数据
+                    Map<String, String> dailyProductQuantities = dbMProductList.stream()
+                            .filter(HFProduction -> HFProduction.getYmd().equals(date))
+                            .collect(Collectors.toMap(
+                                    HFProduction::getEquCode,
+                                    HFProduction::getQuality
+                            ));
+
+                    // 遍历所有产品，如果dailyProduct不存在此产品，添加产品，产量设为空
+                    for (DynamicColumnVo equ : allEquNames) {
+                        String equCode = equ.getCode();
+                        dailyProductQuantities.putIfAbsent(equCode, "0");
+                    }
+
+                    row.putAll(dailyProductQuantities);
+
+                    // 计算并添加当日总产量
+                    int totalQuantity = dailyProductQuantities.values().stream()
+                            .mapToInt(Integer::parseInt)
+                            .sum();
+                    row.put("totalQuantity", totalQuantity);
+
+                    return row;
+                }).collect(Collectors.toList());
+
+        return results;
+    }
+
+    @Override
+    @DS("#header.poolName")
+    public List<DynamicColumnVo> getHFProductionTitle(HFProduction dto) {
+        //查询sql数据
+        List<DynamicColumnVo> data = mesReportWorkMapper.getHFProductionTitle(dto);
+        return data;
+    }
+    private List<String> getDateInterval(String start, String end) {
+        start = start.substring(0,10);
+        end = end.substring(0,10);
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        List<String> dateList = Lists.newArrayList();
+
+        LocalDate localStart = LocalDate.parse(start,fmt);
+        LocalDate localEnd = LocalDate.parse(end,fmt);
+
+        LocalDate nextDate = localStart;
+
+        do {
+            String nextDateStr = nextDate.format(fmt);
+            dateList.add(nextDateStr);
+            nextDate = nextDate.plusDays(1);
+        }while (nextDate.compareTo(localEnd) <= 0);
+        return dateList;
+
+    }
 }

op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml

@@ -35,7 +35,7 @@
 
         <result property="projectName" column="project_name"/>
         <result property="lineName" column="line_name"/>
-
+        <result property="workorderId" column="workorder_id"/>
     </resultMap>
 
     <select id="selectSelfMutualInspectionList" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
@@ -57,22 +57,13 @@
 		    mtsd.remark
 		from mes_table_self mts
 		left join mes_table_self_detial mtsd on mts.id = mtsd.belong_to
-        <where>
-            <if test="reportName == 'ConversionReportLeft'">
-                and CONVERT(date, mts.check_date) = dateadd(day, -1, CONVERT(date,#{checkDate}))
-            </if>
-            <if test = "reportName == 'ConversionReportRight'  or  reportName == 'ConversionReport' or reportName == 'CheckReport' ">
-                and CONVERT(date, mts.check_date) = CONVERT(date,#{checkDate})
-            </if>
-            and mts.line_code = #{lineCode}
-            and mts.del_flag = '0'
-            and mtsd.del_flag = '0'
-            and mts.report_name = #{reportName}
-        </where>
+        where 1 = 1
+        and mts.id = #{id}
+        and mtsd.del_flag = '0'
 	</select>
 
-    <select id="selectProjectName" resultType="java.lang.String" parameterType="java.lang.String">
-        select dict_label
+    <select id="selectProjectName" resultType="MesInspectionReport" parameterType="java.lang.String">
+        select dict_label as projectName , dict_code as projectCode ,dict_sort as tableLine
         from base_dict_data
         where dict_type = #{param}
         order by dict_sort asc
@@ -88,24 +79,23 @@
         order by dict_sort asc
     </select>
 
-    <select id="selectTimeArray" resultType="java.lang.String" parameterType="MesInspectionReport">
+    <select id="selectTimeArray" resultType="MesInspectionReport" parameterType="MesInspectionReport">
         select
-            mtsd.check_time_s + '-' + mtsd.check_time_e as timeArray
+            mtsd.check_time_s as checkTimeS,
+            mtsd.check_time_e as checkTimeE,
+            mtsd.check_time_s + '-' + mtsd.check_time_e as timeArray,
+            mtsd.table_line as tableLine
         from mes_table_self mts
         left join mes_table_self_detial mtsd on mts.id = mtsd.belong_to
         <where>
             and mts.del_flag = '0'
             and mtsd.del_flag = '0'
-            <if test="reportName == 'ConversionReportLeft'">
-                and CONVERT(date, mts.check_date) = dateadd(day, -1, CONVERT(date,#{checkDate}))
-            </if>
-            <if test = "reportName == 'ConversionReportRight'  or  reportName == 'ConversionReport'">
-                and CONVERT(date, mts.check_date) = CONVERT(date,#{checkDate})
-            </if>
+            and CONVERT(date, mts.check_date) = CONVERT(date,#{checkDate})
             and mts.line_code = #{lineCode}
             and mts.report_name = #{reportName}
+            and mtsd.table_line is not null
         </where>
-        group by mtsd.check_time_s,mtsd.check_time_e
+        group by mtsd.check_time_s , mtsd.check_time_e , mtsd.table_line
         order by mtsd.check_time_s
     </select>
 
@@ -125,29 +115,27 @@
     </select>
 
     <select id="selectSelfMutualInspectionData" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
-        select top 1
-            mts.line_code,
-            be.equipment_name as line_name,
-            mts.product_date,
-            mts.product_code,
-            mts.product_name,
-            mts.check_date,
-            mts.bz,
-            mts.remark,
-            mts.create_by
+        select
+        mts.id,
+        mts.line_code,
+        mts.product_date,
+        mts.product_code,
+        mts.product_name,
+        mts.check_date,
+        mts.bz,
+        mts.remark,
+        mts.create_by
         from mes_table_self mts
-        left join base_equipment be on mts.line_code = be.equipment_code
-        <where>
-            and mts.report_name = #{reportName}
-            and mts.del_flag = '0'
-            and mts.line_code = #{lineCode}
-            <if test="reportName == 'ConversionReportLeft'">
-                and CONVERT(date, mts.check_date) = dateadd(day, -1, CONVERT(date,#{checkDate}))
-            </if>
-            <if test = "reportName == 'ConversionReportRight'  or  reportName == 'ConversionReport'">
-                and CONVERT(date, mts.check_date) = CONVERT(date,#{checkDate})
-            </if>
-        </where>
+        where 1=1
+        <if test="reportName == 'CheckReport'">
+            and report_name = #{reportName}
+            and line_code = #{lineCode}
+            and CONVERT(date, mts.check_date) = CONVERT(date,#{checkDate})
+        </if>
+        <if test="reportName != 'CheckReport'">
+            and id = #{id}
+        </if>
+        and del_flag = '0'
     </select>
 
     <select id="getLineCodeList" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
@@ -157,19 +145,89 @@
         and equipment_category = '1'
     </select>
 
-    <select id="selectCheckBoxList" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
-        select
-            mtsd.remark, mtsd.bz
+    <select id="getProductList" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
+	    select
+	      mts.id,
+		  pow.workorder_id,
+		  mts.product_name,
+		  mts.product_code
         from mes_table_self mts
-        left join mes_table_self_detial mtsd on mts.id = mtsd.belong_to
-        where 1=1
-            and mts.del_flag = '0'
-            and mtsd.del_flag = '0'
-            and CONVERT(date, mts.check_date) = CONVERT(date,#{checkDate})
-            and mts.line_code = #{lineCode}
-            and mts.report_name = #{reportName}
-		group by mtsd.remark,mtsd.bz
-        order by mtsd.remark
+        left join pro_order_workorder pow on mts.product_code = pow.product_code
+        where DATEDIFF(DAY, mts.check_date, #{checkDate}) = 0
+        and DATEDIFF(DAY, pow.product_date, #{checkDate}) = 0
+        and mts.del_flag = '0'
+		and mts.product_code is not null AND mts.product_code!= ''
+        and pow.del_flag = '0'
+        and mts.report_name = #{reportName}
+        and mts.line_code = #{lineCode}
+        and pow.workorder_name = #{lineCode}
+		group by
+		mts.id,
+		pow.workorder_id,
+		mts.product_name,
+		mts.product_code
+    </select>
+
+    <select id="getDataCodeList" resultType ="com.op.mes.domain.ProOrderWorkorder" parameterType="MesInspectionReport">
+        select a.batch_code as batchCode
+        from pro_order_workorder_batch a
+        join pro_order_workorder b on a.workorder_id = b.workorder_id
+        where b.workorder_id = #{workorderId}
+        and a.del_flag = '0'
     </select>
 
+    <update id="updateHeaderFooter" parameterType="MesInspectionReport">
+        update mes_table_self
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="bz != null">bz = #{bz},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="java.util.List">
+        <foreach collection="list" item="item" separator=";">
+            update mes_table_self_detial
+            <trim prefix="SET" suffixOverrides=",">
+                <if test="item.checkTimeS != null">check_time_s = #{item.checkTimeS},</if>
+                check_time_e = #{item.checkTimeE},
+                <if test="item.checkResult != null">check_result = #{item.checkResult},</if>
+                <if test="item.updateBy != null">update_by = #{item.updateBy},</if>
+                <if test="item.updateTime != null">update_time = #{item.updateTime},</if>
+                <if test="item.remark != null">remark = #{item.remark},</if>
+                <if test="item.bz != null">bz = #{item.bz},</if>
+            </trim>
+            where id = #{item.id}
+        </foreach>
+    </update>
+
+    <insert id="addBatch">
+        insert into mes_table_self_detial(
+        id, belong_to,
+        remark, bz,
+        create_by, create_time,
+        update_by, update_time,
+        factory_code, del_flag,
+        check_time_s, check_time_e,
+        check_result, info_code,
+        info_name, table_line
+        ) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (
+            #{item.id}, #{item.belongTo},
+            #{item.remark}, #{item.bz},
+            #{item.createBy}, #{item.createTime},
+            #{item.updateBy}, #{item.updateTime},
+            #{item.factoryCode}, #{item.delFlag},
+            #{item.checkTimeS}, #{item.checkTimeE},
+            #{item.checkResult}, #{item.infoCode},
+            #{item.infoName}, #{item.tableLine}
+            )
+        </foreach>
+    </insert>
+
 </mapper>

op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml

@@ -92,6 +92,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from mes_prepare
 		where workorder_code = #{workorderCode} and del_flag = '0'
 	</select>
+    <select id="getBomTraceList" resultType="com.op.mes.domain.MesPrepare">
+		select
+			mpd.material_code productCode,
+			mpd.material_name productName,
+			mpd.attr1,
+			sum(mpd.quantity) quantity,
+			mpd.unit,
+			mpd.recoil
+		from (
+		    select workorder_code from pro_order_workorder where parent_order = '0' and del_flag = '0'
+			and status in('w2','w3')
+			and product_code = #{productCode}
+			<if test="ymArrayStart != null ">and CONVERT(varchar(10),product_date, 120) >= #{ymArrayStart}</if>
+			<if test="ymArrayEnd != null ">and #{ymArrayEnd} >=CONVERT(varchar(10),product_date,120) </if>
+		) pow
+		left join mes_prepare mp on pow.workorder_code = mp.workorder_code and mp.del_flag = '0'
+		left join mes_prepare_detail mpd on mpd.prepare_id = mp.prepare_id and mpd.del_flag = '0'
+		GROUP BY  mpd.material_code,
+		mpd.material_name,
+		mpd.attr1,
+		mpd.unit,
+		mpd.recoil
+		order by mpd.recoil
+	</select>
+	<select id="getCheckTaskTraceList" resultType="com.op.system.api.domain.quality.QcCheckTaskDTO">
+		select
+			pow.workorder_name checkLoc,
+			qct.check_no checkNo,
+			qt.check_name checkType,
+		    pow.workorder_code_sap orderNo,
+			qct.income_batch_no incomeBatchNo,
+			qct.check_status checkStatus,
+			qct.check_man_code checkManCode,
+			qct.check_man_name checkManName,
+		    qct.check_time checkTime,
+			qct.check_result checkResult,
+			qct.reason,
+			qct.remark,
+			qdtc.class_name className
+		from (
+		select workorder_code,workorder_name,workorder_code_sap from pro_order_workorder where parent_order = '0' and del_flag = '0'
+		and status in('w2','w3')
+		and product_code = #{materialCode}
+		<if test="checkTimeStart != null ">and CONVERT(varchar(10),product_date, 120) >= #{checkTimeStart}</if>
+		<if test="checkTimeEnd != null ">and #{checkTimeEnd} >=CONVERT(varchar(10),product_date,120) </if>
+		) pow
+		left join qc_check_task qct on pow.workorder_code = qct.order_no and qct.del_flag = '0'
+		left join qc_check_type qt on qt.order_code = qct.check_type and qt.del_flag = '0'
+		left join qc_defect_type_class qdtc on qdtc.id = qct.remark_code and qdtc.del_flag = '0'
+		where qct.check_type = #{checkType}
+		order by qct.check_no
+	</select>
 
 	<insert id="insertMesPrepare" parameterType="MesPrepare">
 		insert into mes_prepare

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -1187,6 +1187,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="ymArrayEnd != null ">and #{ymArrayEnd} >=CONVERT(varchar(10),qct.income_time,120) </if>
 		order by ba.area_desc asc,qct.income_time desc
 	</select>
+	<select id="getHFProductionList" resultType="com.op.mes.domain.HFProduction">
+		select mdr.device_code equCode,
+			   mdr.ymd,
+		       count(mdr.devcode1) quality,
+			   be.equipment_name equName
+		from (
+				 select device_code,devcode1,CONVERT(varchar(10),create_time, 120) ymd
+				 from mes_dryinghouse_result
+				 where type = '1'
+				<if test="ymArrayStart != null ">and CONVERT(varchar(19),create_time, 120) >= #{ymArrayStart}</if>
+				<if test="ymArrayEnd != null ">and #{ymArrayEnd} >=CONVERT(varchar(19),create_time,120) </if>
+			 ) mdr
+		left join base_equipment be on be.equipment_code = mdr.device_code
+		where 1=1
+		<if test="equName != null ">
+			and be.equipment_name like concat('%',  #{equName}, '%')
+		</if>
+		GROUP BY mdr.ymd,mdr.device_code,be.equipment_name
+        order by mdr.ymd
+	</select>
+	<select id="getHFProductionTitle" resultType="com.op.mes.domain.vo.DynamicColumnVo">
+		select be.equipment_code code,
+		be.equipment_name label
+		from base_equipment be
+		where be.equipment_type_code ='equ_type_hf' and be.del_flag = '0'
+		<if test="equName != null ">
+			and be.equipment_name like concat('%',  #{equName}, '%')
+		</if>
+		order by be.equipment_name
+	</select>
 
 	<insert id="insertMesReportWork" parameterType="MesReportWork">
 		insert into mes_report_work

op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -285,7 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select max(create_time) from sys_user where create_by = 'job' and del_flag = '0'
 	</select>
 	<select id="getExsitCodes" resultType="java.lang.String">
-		select user_name from sys_user where del_flag = '0' and user_name in
+		select user_name from sys_user where user_name in
 		<foreach collection="list" item="code" open="(" separator="," close=")">
 			#{code}
 		</foreach>