留样检验调整(首检后生成留样任务)

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

@@ -91,6 +91,9 @@ public class QcCheckSampleTask extends BaseEntity {
     @Excel(name = "第三次检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private String thirdCheckTime;
 
+    /** 订单号 **/
+    private String orderNo;
+
     public String getId() {
         return id;
     }
@@ -242,4 +245,12 @@ public class QcCheckSampleTask extends BaseEntity {
     public void setThirdCheckTime(String thirdCheckTime) {
         this.thirdCheckTime = thirdCheckTime;
     }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
 }

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

@@ -46,4 +46,16 @@ public interface QcCheckSampleTaskMapper {
      * **/
 
     int batchInsertQcCheckSampleTask(List<QcCheckSampleTask> list);
+
+
+    /**
+     * 批量插入留样检验列表
+     * **/
+    int insertQcCheckSampleTask(QcCheckSampleTask params);
+
+
+    /**
+     *
+     * **/
+    QcCheckSampleTask selectQcCheckSampleTask(QcCheckSampleTask params);
 }

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

@@ -99,6 +99,9 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	@Autowired
 	private QcCheckTaskUserMapper qcCheckTaskUserMapper;
 
+	@Autowired
+	private QcCheckSampleTaskMapper qcCheckSampleTaskMapper;
+
 	private static Pattern p2= Pattern.compile("<[^>]+>");
 
 	/**
@@ -1178,6 +1181,36 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			//发送企业微信
 			this.sendWX(qcCheckTaskIncome);
 		}
+
+		//首检后新增留样检验任务
+		//判断是否是首检
+		if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())){
+			QcCheckSampleTask sampleTask = new QcCheckSampleTask();
+			sampleTask.setId(IdUtils.fastSimpleUUID());
+			sampleTask.setMaterialName(qcCheckTaskIncome.getMaterialName());
+			//来料编码
+			String incomeBatchNo = qcCheckTaskIncome.getIncomeBatchNo();
+			if (StringUtils.isNotBlank(incomeBatchNo)) {
+				if (incomeBatchNo.length() == 24){
+					//国内物料去掉前面时间
+					incomeBatchNo = incomeBatchNo.substring(9,24);
+				} else if (incomeBatchNo.length() < 24){
+					//海外物料取创建时间
+					incomeBatchNo = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,qcCheckTaskIncome.getCreateTime());
+				}
+			}
+
+			sampleTask.setIncomeBatchNo(incomeBatchNo);
+			sampleTask.setOrderNo(qcCheckTaskIncome.getOrderNo());
+			sampleTask.setCreateTime(qcCheckTaskIncome.getCreateTime());
+			//查询该物料是否留样
+			QcCheckSampleTask temp = qcCheckSampleTaskMapper.selectQcCheckSampleTask(sampleTask);
+			//未留样则进行留样
+			if(Objects.isNull(temp)){
+				qcCheckSampleTaskMapper.insertQcCheckSampleTask(sampleTask);
+			}
+		}
+
 		return 1 ;
 	}
 

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

@@ -35,7 +35,7 @@
             id,
             material_name,
             income_batch_no,
-            work_order_code_sap,
+            SUBSTRING ( pow.workorder_code_sap, 4, 12 ) AS work_order_code_sap,
             sample_time,
             sample_num,
             sample_address,
@@ -51,7 +51,8 @@
             third_check_user_name,
             third_check_result,
             third_check_time
-        from qc_check_sample_task
+        from qc_check_sample_task task
+        left join pro_order_workorder pow ON pow.workorder_code = task.order_no
         <where>
             <if test="queryDate != null and queryDate != ''">
                 and CONVERT(VARCHAR(10), create_time ,23)  <![CDATA[ = ]]> #{queryDate}
@@ -66,10 +67,10 @@
                 and material_name like concat('%', #{materialName}, '%')
             </if>
             <if test="workOrderCodeSap != null and workOrderCodeSap != ''">
-                and work_order_code_sap <![CDATA[ = ]]> #{workOrderCodeSap}
+                and SUBSTRING ( pow.workorder_code_sap, 4, 12 ) <![CDATA[ = ]]> #{workOrderCodeSap}
             </if>
         </where>
-        order by sample_time desc,create_time desc
+        order by sample_time desc,task.create_time desc
     </select>
 
 
@@ -231,4 +232,29 @@
 
     </insert>
 
+    <insert id="insertQcCheckSampleTask" parameterType="com.op.quality.domain.QcCheckSampleTask">
+        INSERT INTO qc_check_sample_task (
+            id,
+            material_name,
+            income_batch_no,
+            order_no,
+            create_time
+        )
+        VALUES
+        (
+            #{id},
+            #{materialName},
+            #{incomeBatchNo},
+            #{orderNo},
+            #{createTime}
+        )
+    </insert>
+
+    <select id="selectQcCheckSampleTask" parameterType="com.op.quality.domain.QcCheckSampleTask" resultType="com.op.quality.domain.QcCheckSampleTask">
+        SELECT id
+        FROM qc_check_sample_task
+        WHERE material_name = #{materialName} AND income_batch_no = #{incomeBatchNo} AND order_no = #{orderNo}
+    </select>
+
+
 </mapper>