产品主键跟踪

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

@@ -1,17 +1,22 @@
 package com.op.mes.controller;
 
 import com.op.common.core.domain.R;
+import com.op.common.core.utils.bean.BeanUtils;
+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.MesReportWork;
+import com.op.mes.domain.*;
 import com.op.mes.service.IMesReportWorksService;
+import com.op.common.core.utils.bean.BeanUtils;
 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.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 import static com.op.common.core.utils.PageUtils.startPage;
@@ -41,4 +46,38 @@ public class MesReportWorksController extends BaseController {
     public R mesProTask() {
         return mesReportWorksService.mesProTask();
     }
+
+    /**产品主键跟踪**/
+    @GetMapping("/getProductTrace")
+    public TableDataInfo getProductTrace(MesProductTrace dto) {
+        startPage();
+        List<MesProductTrace> list = mesReportWorksService.getProductTrace(dto);
+        return getDataTable(list);
+    }
+    @PostMapping("/getProductTraceExport")
+    public void processFinishExport(HttpServletResponse response, MesProductTrace qo) {
+        List<MesProductTrace> list0 = mesReportWorksService.getProductTrace(qo);
+        if("cp".equals(qo.getProdType())){
+            List<MesProductTraceCPExp> list = new ArrayList<>();
+            MesProductTraceCPExp cpdto = null;
+            for(MesProductTrace dto0:list0){
+                cpdto = new MesProductTraceCPExp();
+                BeanUtils.copyProperties(dto0,cpdto);
+                list.add(cpdto);
+            }
+            ExcelUtil<MesProductTraceCPExp> util = new ExcelUtil<MesProductTraceCPExp>(MesProductTraceCPExp.class);
+            util.exportExcel(response, list, "产品主键跟踪");
+        }else{
+            List<MesProductTraceBCExp> list = new ArrayList<>();
+            MesProductTraceBCExp cpdto = null;
+            for(MesProductTrace dto0:list0){
+                cpdto = new MesProductTraceBCExp();
+                BeanUtils.copyProperties(dto0,cpdto);
+                list.add(cpdto);
+            }
+            ExcelUtil<MesProductTraceBCExp> util = new ExcelUtil<MesProductTraceBCExp>(MesProductTraceBCExp.class);
+            util.exportExcel(response, list, "产品主键跟踪");
+        }
+
+    }
 }

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

@@ -0,0 +1,222 @@
+package com.op.mes.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ *
+ * @author Open Platform
+ * @date 2024-12-12
+ */
+public class MesProductTrace extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    @Excel(name = "产品编码")
+    private String productCode;
+    @Excel(name = "产品中文名称")
+    private String productDescZh;
+    @Excel(name = "产品英文名称")
+    private String productDescEn;
+    @Excel(name = "最大批次数量")
+    private String batchMax;
+    @Excel(name = "卡板装载量")
+    private String palletNum;
+    @Excel(name = "箱码规格")
+    private String spec;
+    @Excel(name = "品类")
+    private String productGroupName;
+    @Excel(name = "子母工单比例")
+    private String unity;
+    @Excel(name = "检验标准")
+    private String standarNo;
+    @Excel(name = "箱型")
+    private String boxType;
+    @Excel(name = "垛型")
+    private String packType;
+
+    private String cpkType;
+    @Excel(name = "CPK品类")
+    private String cpkTypeName;
+    @Excel(name = "检验周期")
+    private String warehouseCycle;
+    @Excel(name = "产线")
+    private String lineNames;
+    @Excel(name = "区位")
+    private String waNames;
+    private String waCode;
+    @Excel(name = "上载到MES时间")
+    private String onLineTimes;
+    private String ymArrayStart;
+    private String ymArrayEnd;
+    private String prodType;
+
+    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 getWaNames() {
+        return waNames;
+    }
+
+    public void setWaNames(String waNames) {
+        this.waNames = waNames;
+    }
+
+    public String getLineNames() {
+        return lineNames;
+    }
+
+    public void setLineNames(String lineNames) {
+        this.lineNames = lineNames;
+    }
+
+    public String getWaCode() {
+        return waCode;
+    }
+
+    public void setWaCode(String waCode) {
+        this.waCode = waCode;
+    }
+
+    public String getOnLineTimes() {
+        return onLineTimes;
+    }
+
+    public void setOnLineTimes(String onLineTimes) {
+        this.onLineTimes = onLineTimes;
+    }
+
+    public String getProdType() {
+        return prodType;
+    }
+
+    public void setProdType(String prodType) {
+        this.prodType = prodType;
+    }
+
+    public String getWarehouseCycle() {
+        return warehouseCycle;
+    }
+
+    public void setWarehouseCycle(String warehouseCycle) {
+        this.warehouseCycle = warehouseCycle;
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductDescZh() {
+        return productDescZh;
+    }
+
+    public void setProductDescZh(String productDescZh) {
+        this.productDescZh = productDescZh;
+    }
+
+    public String getProductDescEn() {
+        return productDescEn;
+    }
+
+    public void setProductDescEn(String productDescEn) {
+        this.productDescEn = productDescEn;
+    }
+
+    public String getBatchMax() {
+        return batchMax;
+    }
+
+    public void setBatchMax(String batchMax) {
+        this.batchMax = batchMax;
+    }
+
+    public String getPalletNum() {
+        return palletNum;
+    }
+
+    public void setPalletNum(String palletNum) {
+        this.palletNum = palletNum.replace(".00","");
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec.replace(".0000","");
+    }
+
+    public String getProductGroupName() {
+        return productGroupName;
+    }
+
+    public void setProductGroupName(String productGroupName) {
+        this.productGroupName = productGroupName;
+    }
+
+    public String getUnity() {
+        return unity;
+    }
+
+    public void setUnity(String unity) {
+        this.unity = unity;
+    }
+
+    public String getStandarNo() {
+        return standarNo;
+    }
+
+    public void setStandarNo(String standarNo) {
+        this.standarNo = standarNo;
+    }
+
+    public String getBoxType() {
+        return boxType;
+    }
+
+    public void setBoxType(String boxType) {
+        this.boxType = boxType;
+    }
+
+    public String getPackType() {
+        return packType;
+    }
+
+    public void setPackType(String packType) {
+        this.packType = packType;
+    }
+
+    public String getCpkType() {
+        return cpkType;
+    }
+
+    public void setCpkType(String cpkType) {
+        this.cpkType = cpkType;
+    }
+
+    public String getCpkTypeName() {
+        return cpkTypeName;
+    }
+
+    public void setCpkTypeName(String cpkTypeName) {
+        this.cpkTypeName = cpkTypeName;
+    }
+}

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

@@ -0,0 +1,111 @@
+package com.op.mes.domain;
+
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+
+/**
+ *
+ * @author Open Platform
+ * @date 2024-12-12
+ */
+public class MesProductTraceBCExp extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    @Excel(name = "产品编码")
+    private String productCode;
+    @Excel(name = "产品中文名称")
+    private String productDescZh;
+    @Excel(name = "卡板装载量")
+    private String palletNum;
+    private String spec;
+    @Excel(name = "品类")
+    private String productGroupName;
+    @Excel(name = "检验标准")
+    private String standarNo;
+    @Excel(name = "检验周期")
+    private String warehouseCycle;
+    @Excel(name = "区位")
+    private String waNames;
+    private String waCode;
+    @Excel(name = "上载到MES时间")
+    private String onLineTimes;
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductDescZh() {
+        return productDescZh;
+    }
+
+    public void setProductDescZh(String productDescZh) {
+        this.productDescZh = productDescZh;
+    }
+
+    public String getPalletNum() {
+        return palletNum;
+    }
+
+    public void setPalletNum(String palletNum) {
+        this.palletNum = palletNum;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getProductGroupName() {
+        return productGroupName;
+    }
+
+    public void setProductGroupName(String productGroupName) {
+        this.productGroupName = productGroupName;
+    }
+
+    public String getStandarNo() {
+        return standarNo;
+    }
+
+    public void setStandarNo(String standarNo) {
+        this.standarNo = standarNo;
+    }
+
+    public String getWarehouseCycle() {
+        return warehouseCycle;
+    }
+
+    public void setWarehouseCycle(String warehouseCycle) {
+        this.warehouseCycle = warehouseCycle;
+    }
+
+    public String getWaNames() {
+        return waNames;
+    }
+
+    public void setWaNames(String waNames) {
+        this.waNames = waNames;
+    }
+
+    public String getWaCode() {
+        return waCode;
+    }
+
+    public void setWaCode(String waCode) {
+        this.waCode = waCode;
+    }
+
+    public String getOnLineTimes() {
+        return onLineTimes;
+    }
+
+    public void setOnLineTimes(String onLineTimes) {
+        this.onLineTimes = onLineTimes;
+    }
+}

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

@@ -0,0 +1,171 @@
+package com.op.mes.domain;
+
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+
+/**
+ *
+ * @author Open Platform
+ * @date 2024-12-12
+ */
+public class MesProductTraceCPExp extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    @Excel(name = "产品编码")
+    private String productCode;
+    @Excel(name = "产品中文名称")
+    private String productDescZh;
+    @Excel(name = "产品英文名称")
+    private String productDescEn;
+    @Excel(name = "最大批次数量")
+    private String batchMax;
+    @Excel(name = "卡板装载量")
+    private String palletNum;
+    @Excel(name = "箱码规格")
+    private String spec;
+    @Excel(name = "品类")
+    private String productGroupName;
+    @Excel(name = "子母工单比例")
+    private String unity;
+    @Excel(name = "检验标准")
+    private String standarNo;
+    @Excel(name = "箱型")
+    private String boxType;
+    @Excel(name = "垛型")
+    private String packType;
+
+    private String cpkType;
+    @Excel(name = "CPK品类")
+    private String cpkTypeName;
+
+    @Excel(name = "产线")
+    private String lineNames;
+
+    @Excel(name = "上载到MES时间")
+    private String onLineTimes;
+
+
+
+
+    public String getLineNames() {
+        return lineNames;
+    }
+
+    public void setLineNames(String lineNames) {
+        this.lineNames = lineNames;
+    }
+
+
+
+    public String getOnLineTimes() {
+        return onLineTimes;
+    }
+
+    public void setOnLineTimes(String onLineTimes) {
+        this.onLineTimes = onLineTimes;
+    }
+
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductDescZh() {
+        return productDescZh;
+    }
+
+    public void setProductDescZh(String productDescZh) {
+        this.productDescZh = productDescZh;
+    }
+
+    public String getProductDescEn() {
+        return productDescEn;
+    }
+
+    public void setProductDescEn(String productDescEn) {
+        this.productDescEn = productDescEn;
+    }
+
+    public String getBatchMax() {
+        return batchMax;
+    }
+
+    public void setBatchMax(String batchMax) {
+        this.batchMax = batchMax;
+    }
+
+    public String getPalletNum() {
+        return palletNum;
+    }
+
+    public void setPalletNum(String palletNum) {
+        this.palletNum = palletNum.replace(".00","");
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec.replace(".0000","");
+    }
+
+    public String getProductGroupName() {
+        return productGroupName;
+    }
+
+    public void setProductGroupName(String productGroupName) {
+        this.productGroupName = productGroupName;
+    }
+
+    public String getUnity() {
+        return unity;
+    }
+
+    public void setUnity(String unity) {
+        this.unity = unity;
+    }
+
+    public String getStandarNo() {
+        return standarNo;
+    }
+
+    public void setStandarNo(String standarNo) {
+        this.standarNo = standarNo;
+    }
+
+    public String getBoxType() {
+        return boxType;
+    }
+
+    public void setBoxType(String boxType) {
+        this.boxType = boxType;
+    }
+
+    public String getPackType() {
+        return packType;
+    }
+
+    public void setPackType(String packType) {
+        this.packType = packType;
+    }
+
+    public String getCpkType() {
+        return cpkType;
+    }
+
+    public void setCpkType(String cpkType) {
+        this.cpkType = cpkType;
+    }
+
+    public String getCpkTypeName() {
+        return cpkTypeName;
+    }
+
+    public void setCpkTypeName(String cpkTypeName) {
+        this.cpkTypeName = cpkTypeName;
+    }
+}

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

@@ -206,4 +206,12 @@ public interface MesReportWorkMapper {
     List<Map<String, String>> getPlanNumber(String shiftId);
 
     List<String> getUnionRemark(String workorderCode);
+
+    List<MesProductTrace> getProductTraceCP(MesProductTrace dto);
+
+    List<MesProductTrace> getProductTraceBC(MesProductTrace dto);
+
+    List<ProOrderWorkorder> getWorkList(MesProductTrace qo);
+
+    List<ProOrderWorkorder> getWaList(MesProductTrace qo);
 }

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

@@ -1,6 +1,7 @@
 package com.op.mes.service;
 
 import com.op.common.core.domain.R;
+import com.op.mes.domain.MesProductTrace;
 import com.op.mes.domain.MesReportWork;
 
 import java.util.List;
@@ -10,4 +11,6 @@ public interface IMesReportWorksService {
     List<MesReportWork> getReportWorksList(MesReportWork mesReportWork);
 
     R mesProTask();
+
+    List<MesProductTrace> getProductTrace(MesProductTrace dto);
 }

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

@@ -9,6 +9,7 @@ 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.mapper.MesReportWorkMapper;
@@ -33,6 +34,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static com.op.common.core.web.domain.AjaxResult.error;
 import static com.op.common.core.web.domain.AjaxResult.success;
@@ -82,6 +84,69 @@ public class MesReportWorksServiceImpl implements IMesReportWorksService {
         }
         return R.ok();
     }
+
+    @Override
+    @DS("#header.poolName")
+    public List<MesProductTrace> getProductTrace(MesProductTrace qo) {
+        List<MesProductTrace> dtos = null;
+        if("cp".equals(qo.getProdType())){
+            dtos = mesReportWorkMapper.getProductTraceCP(qo);
+            //产线//上载mes时间
+            for(MesProductTrace dto:dtos){
+              qo.setProductCode(dto.getProductCode());
+              List<ProOrderWorkorder> lines = mesReportWorkMapper.getWorkList(qo);
+              List<String> rlineArray = lines.stream()
+                    .map(ProOrderWorkorder::getWorkorderName)
+                    .collect(Collectors.toSet()) // 去重
+                    .stream()
+                    .collect(Collectors.toList());
+                Collections.sort(rlineArray);
+                dto.setLineNames(String.join(";", rlineArray));
+
+                List<String> rdate = lines.stream()
+                        .map(ProOrderWorkorder::getProductDateStart)
+                        .collect(Collectors.toSet()) // 去重
+                        .stream()
+                        .collect(Collectors.toList()); // 连接成字符串
+                Collections.sort(rdate);
+                Collections.reverse(rdate);
+                if(rdate.size()>7){
+                    dto.setOnLineTimes(String.join(";", rdate.subList(0,7)));
+                }else{
+                    dto.setOnLineTimes(String.join(";", rdate));
+                }
+
+            }
+        }else{
+            dtos = mesReportWorkMapper.getProductTraceBC(qo);
+            //区位//上载mes时间
+            for(MesProductTrace dto:dtos){
+                qo.setProductCode(dto.getProductCode());
+                List<ProOrderWorkorder> was = mesReportWorkMapper.getWaList(qo);
+                List<String> rwaArray = was.stream()
+                        .map(ProOrderWorkorder::getWorkorderName)
+                        .collect(Collectors.toSet()) // 去重
+                        .stream()
+                        .collect(Collectors.toList()); // 连接成字符串
+                Collections.sort(rwaArray);
+                dto.setWaNames(String.join(";", rwaArray));
+
+                List<String> rdate = was.stream()
+                        .map(ProOrderWorkorder::getProductDateStart)
+                        .collect(Collectors.toSet()) // 去重
+                        .stream()
+                        .collect(Collectors.toList()); // 连接成字符串
+                Collections.sort(rdate);
+                Collections.reverse(rdate);
+                if(rdate.size()>7){
+                    dto.setOnLineTimes(String.join(";", rdate.subList(0,7)));
+                }else{
+                    dto.setOnLineTimes(String.join(";", rdate));
+                }
+            }
+        }
+        return dtos;
+    }
     public void setMesProInfoFunc(String poolName){
         DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
         //工厂名称

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

@@ -1086,6 +1086,111 @@ WHERE
 	<select id="getUnionRemark" resultType="java.lang.String">
 		select remark from mes_report_work where workorder_code = #{workorderCode} and del_flag = '0' and remark is not null
 	</select>
+	<select id="getProductTraceCP" resultType="com.op.mes.domain.MesProductTrace">
+		select bp.product_code productCode,
+			   bp.product_desc_zh productDescZh,
+			   bp.product_desc_en productDescEn,
+			   bp.mvgr5_nm batchMax,
+			   bpa.pallet_num palletNum,
+			   concat(mb.length,'*',mb.width,'*',mb.height) spec,
+			   bp.product_group_name productGroupName,
+			   bp.umrez unity,
+			   bp.mvgr5 standarNo,
+			   bp.box_type boxType,bpa.pack_type packType,
+			   bpa.cpk_type cpkType, dict.dict_label cpkTypeName
+		from (select DISTINCT product_code from pro_order_workorder where parent_order = '0' and del_flag = '0'
+			and status in('w2','w3')
+			<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 base_product bp on pow.product_code = bp.product_code
+			 left join base_product_attached bpa on concat('0000000',bpa.product_code) = bp.product_code
+			 left join mes_box mb on mb.box_type = bp.box_type
+			 left join lanju_op_cloud.dbo.sys_dict_data dict on dict.dict_value = bpa.cpk_type and dict.dict_type= 'qms_category'
+		where bp.del_flag = '0'
+		  and (bp.product_code like '00000001%' or bp.product_code like '00000002%' or bp.product_code like '00000003%'
+			or bp.product_code like '00000004%' or bp.product_code like '00000005%' or bp.product_code like '00000006%'
+			or bp.product_code like '00000007%'
+		      )
+		<if test="productCode != null ">
+			and bp.product_code like concat('%',  #{productCode}, '%')
+		</if>
+		<if test="productDescZh != null ">
+			and bp.product_desc_zh like concat('%',  #{productDescZh}, '%')
+		</if>
+		<if test="productDescEn != null ">
+			and bp.product_desc_en like concat('%',  #{productDescEn}, '%')
+		</if>
+		<if test="productGroupName != null ">
+			and bp.product_group_name like concat('%',  #{productGroupName}, '%')
+		</if>
+		<if test="standarNo != null ">
+			and bp.mvgr5 like concat('%',  #{standarNo}, '%')
+		</if>
+          order by bp.product_code
+	</select>
+	<select id="getProductTraceBC" resultType="com.op.mes.domain.MesProductTrace">
+		select bp.product_code productCode,
+			   bp.product_desc_zh productDescZh,
+			   bp.product_desc_en productDescEn,
+			   bpa.pallet_num palletNum,
+			   bp.product_group_name productGroupName,
+			   bp.umrez unity,
+			   bp.mvgr5 standarNo,
+			   bpa.warehouse_cycle warehouseCycle,
+			   bpa.cpk_type cpkType, dict.dict_label cpkTypeName
+		from (select DISTINCT material_code from qc_check_task where check_type ='checkTypeLL' and del_flag = '0'
+				<if test="ymArrayStart != null ">and CONVERT(varchar(10),income_time, 120) >= #{ymArrayStart}</if>
+				<if test="ymArrayEnd != null ">and #{ymArrayEnd} >=CONVERT(varchar(10),income_time,120) </if>
+		    ) qct
+				 left join base_product bp on qct.material_code = bp.product_code
+				 left join base_product_attached bpa on concat('0000000',bpa.product_code) = bp.product_code
+				 left join lanju_op_cloud.dbo.sys_dict_data dict on dict.dict_value = bpa.cpk_type and dict.dict_type= 'qms_category'
+		where bp.del_flag = '0'
+		  and (bp.product_code like '00000001%' or bp.product_code like '00000002%' or bp.product_code like '00000003%'
+			or bp.product_code like '00000004%' or bp.product_code like '00000005%' or bp.product_code like '00000006%'
+			or bp.product_code like '00000007%')
+		<if test="productCode != null ">
+			and bp.product_code like concat('%',  #{productCode}, '%')
+		</if>
+		<if test="productDescZh != null ">
+			and bp.product_desc_zh like concat('%',  #{productDescZh}, '%')
+		</if>
+		<if test="productDescEn != null ">
+			and bp.product_desc_en like concat('%',  #{productDescEn}, '%')
+		</if>
+		<if test="productGroupName != null ">
+			and bp.product_group_name like concat('%',  #{productGroupName}, '%')
+		</if>
+		<if test="standarNo != null ">
+			and bp.mvgr5 like concat('%',  #{standarNo}, '%')
+		</if>
+		order by bp.product_code
+	</select>
+	<select id="getWorkList" resultType="com.op.mes.domain.ProOrderWorkorder">
+		select be.equipment_name workorderName,
+			   FORMAT(pow.product_date , 'yyyy-MM-dd') productDateStart
+		from pro_order_workorder pow
+		left join base_equipment be on be.equipment_code = pow.workorder_name
+		where pow.product_code = #{productCode}
+		  and pow.del_flag = '0'
+		  and pow.workorder_name is not null and pow.status in('w2','w3')
+		<if test="ymArrayStart != null ">and CONVERT(varchar(10),pow.product_date, 120) >= #{ymArrayStart}</if>
+		<if test="ymArrayEnd != null ">and #{ymArrayEnd} >=CONVERT(varchar(10),pow.product_date,120) </if>
+		order by  be.equipment_name asc,pow.product_date desc
+	</select>
+	<select id="getWaList" resultType="com.op.mes.domain.ProOrderWorkorder">
+		SELECT
+			case when ba.area_desc is null then '' else ba.area_desc end workorderName,
+			FORMAT(qct.income_time, 'yyyy-MM-dd') productDateStart
+		FROM qc_check_task qct
+	    left join base_product_attached bpa on concat('0000000',bpa.product_code) = qct.material_code
+	    left join base_area ba on ba.region_code = bpa.wa_code and ba.del_flag = '0'
+		WHERE qct.material_code = #{productCode} and qct.del_flag = '0'
+		<if test="ymArrayStart != null ">and CONVERT(varchar(10),qct.income_time, 120) >= #{ymArrayStart}</if>
+		<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>
 
 	<insert id="insertMesReportWork" parameterType="MesReportWork">
 		insert into mes_report_work

op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java

@@ -777,7 +777,7 @@ public class QcStaticTableController extends BaseController {
         excelCols.add(new ExcelCol("线体名称", "equipmentName", 30));
         excelCols.add(new ExcelCol("产品编码", "materialCode", 30));
         excelCols.add(new ExcelCol("产品名称", "materialName", 30));
-        excelCols.add(new ExcelCol("CPK品类", "packTypeName", 30));
+        excelCols.add(new ExcelCol("CPK品类", "cpkTypeName", 30));
         excelCols.add(new ExcelCol("工单编码", "workorderCode", 30));
         excelCols.add(new ExcelCol("批次", "batchNo", 30));
         excelCols.add(new ExcelCol("订单编码", "workorderCodeSap", 30));