留样检验调整

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

@@ -7,6 +7,7 @@ import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.core.web.page.TableDataInfo;
 import com.op.common.log.annotation.Log;
 import com.op.common.log.enums.BusinessType;
+import com.op.quality.domain.QcCheckSampleSignTask;
 import com.op.quality.domain.QcCheckSampleTask;
 import com.op.quality.domain.query.QcCheckSampleTaskQuery;
 import com.op.quality.service.IQcCheckSampleTaskService;
@@ -40,6 +41,25 @@ public class QcCheckSampleTaskController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取留样登记表
+     * **/
+    @GetMapping("/signList")
+    public TableDataInfo signList(QcCheckSampleTaskQuery query) {
+        startPage();
+        List<QcCheckSampleSignTask> list = qcCheckSampleTaskService.selectQcCheckSampleSignTaskList(query);
+        return getDataTable(list);
+    }
+
+    /** 导出留样登记表 **/
+    @Log(title = "导出留样登记表", businessType = BusinessType.EXPORT)
+    @PostMapping("/sign/export")
+    public void exportQcCheckSampleSign(HttpServletResponse response, QcCheckSampleTaskQuery query) {
+        List<QcCheckSampleSignTask> list = qcCheckSampleTaskService.selectQcCheckSampleSignTaskList(query);
+        ExcelUtil<QcCheckSampleSignTask> util = new ExcelUtil<QcCheckSampleSignTask>(QcCheckSampleSignTask.class);
+        util.exportExcel(response, list, "导出留样登记表");
+    }
+
 
     /** 获取待复检样品列表 **/
     @GetMapping("/wait-list")

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckSampleSignTask.java

@@ -0,0 +1,108 @@
+package com.op.quality.domain;
+
+import com.op.common.core.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * remark
+ *
+ * @author 019117
+ * @date
+ */
+public class QcCheckSampleSignTask {
+
+    /** id **/
+    private String id;
+
+    /** 排序 **/
+    private String sort;
+
+    /** 样品名称 **/
+    @Excel(name = "样品名称")
+    private String materialName;
+
+    /** 生产批号 **/
+    @Excel(name = "生产批号")
+    private String incomeBatchNo;
+
+    /** 留样时间 **/
+    @Excel(name = "留样时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date sampleTime;
+
+    /** 留样数量 **/
+    @Excel(name = "留样数量")
+    private String sampleNum;
+
+    /** 取样人 **/
+    @Excel(name = "取样人")
+    private String sampleUserName;
+
+    /*** 取样地点 ***/
+    @Excel(name = "取样地点")
+    private String gainSampleAddress;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public String getIncomeBatchNo() {
+        return incomeBatchNo;
+    }
+
+    public void setIncomeBatchNo(String incomeBatchNo) {
+        this.incomeBatchNo = incomeBatchNo;
+    }
+
+    public Date getSampleTime() {
+        return sampleTime;
+    }
+
+    public void setSampleTime(Date sampleTime) {
+        this.sampleTime = sampleTime;
+    }
+
+    public String getSampleNum() {
+        return sampleNum;
+    }
+
+    public void setSampleNum(String sampleNum) {
+        this.sampleNum = sampleNum;
+    }
+
+    public String getSampleUserName() {
+        return sampleUserName;
+    }
+
+    public void setSampleUserName(String sampleUserName) {
+        this.sampleUserName = sampleUserName;
+    }
+
+    public String getGainSampleAddress() {
+        return gainSampleAddress;
+    }
+
+    public void setGainSampleAddress(String gainSampleAddress) {
+        this.gainSampleAddress = gainSampleAddress;
+    }
+}

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckSampleTaskMapper.java

@@ -1,5 +1,6 @@
 package com.op.quality.mapper;
 
+import com.op.quality.domain.QcCheckSampleSignTask;
 import com.op.quality.domain.QcCheckSampleTask;
 import com.op.quality.domain.query.QcCheckSampleTaskQuery;
 import org.apache.ibatis.annotations.Mapper;
@@ -21,6 +22,11 @@ public interface QcCheckSampleTaskMapper {
      * **/
     List<QcCheckSampleTask> selectQcCheckSampleTaskList(QcCheckSampleTaskQuery query);
 
+    /**
+     * 留样检验任务列表
+     * **/
+    List<QcCheckSampleSignTask> selectQcCheckSampleSignTaskList(QcCheckSampleTaskQuery query);
+
     /**
      * 获取待复检样品列表
      * **/

op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckSampleTaskService.java

@@ -1,6 +1,7 @@
 package com.op.quality.service;
 
 import com.op.common.core.web.domain.AjaxResult;
+import com.op.quality.domain.QcCheckSampleSignTask;
 import com.op.quality.domain.QcCheckSampleTask;
 import com.op.quality.domain.query.QcCheckSampleTaskQuery;
 
@@ -18,6 +19,11 @@ public interface IQcCheckSampleTaskService {
      * **/
     List<QcCheckSampleTask> selectQcCheckSampleTaskList(QcCheckSampleTaskQuery query);
 
+    /**
+     * 留样检验任务列表
+     * **/
+    List<QcCheckSampleSignTask> selectQcCheckSampleSignTaskList(QcCheckSampleTaskQuery query);
+
 
     /**
      * 获取待复检样品列表

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckSampleTaskServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.core.web.domain.AjaxResult;
+import com.op.quality.domain.QcCheckSampleSignTask;
 import com.op.quality.domain.QcCheckSampleTask;
 import com.op.quality.domain.query.QcCheckSampleTaskQuery;
 import com.op.quality.mapper.QcCheckSampleTaskMapper;
@@ -34,9 +35,6 @@ public class QcCheckSampleTaskServiceImpl implements IQcCheckSampleTaskService {
     @Resource
     private QcCheckSampleTaskMapper qcCheckSampleTaskMapper;
 
-    @Resource
-    private RemoteUserService remoteUserService;
-
     /**
      * 留样检验任务列表
      * **/
@@ -46,6 +44,16 @@ public class QcCheckSampleTaskServiceImpl implements IQcCheckSampleTaskService {
         return qcCheckSampleTaskMapper.selectQcCheckSampleTaskList(query);
     }
 
+
+    /**
+     * 留样检验任务列表
+     * **/
+    @Override
+    @DS("#header.poolName")
+    public List<QcCheckSampleSignTask> selectQcCheckSampleSignTaskList(QcCheckSampleTaskQuery query) {
+        return qcCheckSampleTaskMapper.selectQcCheckSampleSignTaskList(query);
+    }
+
     /**
      * 获取待复检样品列表
      *

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -1185,6 +1185,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		//首检后新增留样检验任务
 		//判断是否是首检
 		if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())){
+
 			QcCheckSampleTask sampleTask = new QcCheckSampleTask();
 			sampleTask.setId(IdUtils.fastSimpleUUID());
 			sampleTask.setMaterialName(qcCheckTaskIncome.getMaterialName());
@@ -1194,9 +1195,6 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 				if (incomeBatchNo.length() == 24){
 					//国内物料去掉前面时间
 					incomeBatchNo = incomeBatchNo.substring(8,24);
-				} else if (incomeBatchNo.length() < 24){
-					//海外物料取创建时间
-					incomeBatchNo = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,qcCheckTaskIncome.getCreateTime());
 				}
 			}
 

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml

@@ -33,11 +33,10 @@
 
     <select id="selectQcCheckSampleTaskList" parameterType="com.op.quality.domain.query.QcCheckSampleTaskQuery"
             resultMap="QcCheckSampleDefectResult">
-        select
+        SELECT
             id,
             material_name,
             income_batch_no,
-            work_order_code_sap,
             sample_time,
             sample_num,
             sample_address,
@@ -52,9 +51,7 @@
             third_check_user_code,
             third_check_user_name,
             third_check_result,
-            third_check_time,
-            sample_user_code,
-            sample_user_name
+            third_check_time
         from qc_check_sample_task task
         <where>
             <if test="queryDate != null and queryDate != ''">
@@ -76,6 +73,40 @@
         order by task.sample_time desc,task.create_time desc
     </select>
 
+    <select id="selectQcCheckSampleSignTaskList" parameterType="com.op.quality.domain.query.QcCheckSampleTaskQuery"
+            resultType="com.op.quality.domain.QcCheckSampleSignTask">
+        SELECT
+            task.id,
+            task.material_name materialName,
+            task.income_batch_no incomeBatchNo,
+            task.sample_time sampleTime,
+            task.sample_num sampleNum,
+            task.sample_user_name sampleUserName,
+            o.workorder_name gainSampleAddress
+        FROM
+        qc_check_sample_task task
+        LEFT JOIN pro_order_workorder o ON  o.workorder_code_sap =  task.work_order_code_sap
+        <where>
+            <if test="queryDate != null and queryDate != ''">
+                and CONVERT(VARCHAR(10), task.create_time ,23)  <![CDATA[ = ]]> #{queryDate}
+            </if>
+            <if test="startSampleDate != null and startSampleDate != ''">
+                and CONVERT(VARCHAR(10), task.sample_time ,23)  <![CDATA[ >= ]]> #{startSampleDate}
+            </if>
+            <if test="endSampleDate != null and endSampleDate != ''">
+                and CONVERT(VARCHAR(10), task.sample_time ,23)  <![CDATA[ <= ]]> #{endSampleDate}
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and task.material_name like concat('%', #{materialName}, '%')
+            </if>
+            <if test="workOrderCodeSap != null and workOrderCodeSap != ''">
+                and task.work_order_code_sap = #{workOrderCodeSap}
+            </if>
+        </where>
+        ORDER BY
+            task.sample_time DESC, task.create_time DESC
+    </select>
+
 
     <select id="selectQcWaitCheckSampleTaskList" parameterType="com.op.quality.domain.query.QcCheckSampleTaskQuery"
             resultMap="QcCheckSampleDefectResult">