成品留样调整

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

@@ -91,6 +91,16 @@ public class QcCheckSampleTask extends BaseEntity {
     @Excel(name = "第三次检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private String thirdCheckTime;
 
+    /** 留样人工号 **/
+    @Excel(name = "留样人工号")
+    private String sampleUserCode;
+
+
+    /** 留样人姓名 **/
+    @Excel(name = "留样人姓名")
+    private String sampleUserName;
+
+
     /** 订单号 **/
     private String orderNo;
 
@@ -253,4 +263,20 @@ public class QcCheckSampleTask extends BaseEntity {
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
+
+    public String getSampleUserCode() {
+        return sampleUserCode;
+    }
+
+    public void setSampleUserCode(String sampleUserCode) {
+        this.sampleUserCode = sampleUserCode;
+    }
+
+    public String getSampleUserName() {
+        return sampleUserName;
+    }
+
+    public void setSampleUserName(String sampleUserName) {
+        this.sampleUserName = sampleUserName;
+    }
 }

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

@@ -1193,7 +1193,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			if (StringUtils.isNotBlank(incomeBatchNo)) {
 				if (incomeBatchNo.length() == 24){
 					//国内物料去掉前面时间
-					incomeBatchNo = incomeBatchNo.substring(9,24);
+					incomeBatchNo = incomeBatchNo.substring(8,24);
 				} else if (incomeBatchNo.length() < 24){
 					//海外物料取创建时间
 					incomeBatchNo = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,qcCheckTaskIncome.getCreateTime());
@@ -1201,8 +1201,9 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			}
 
 			sampleTask.setIncomeBatchNo(incomeBatchNo);
-			sampleTask.setOrderNo(qcCheckTaskIncome.getOrderNo());
-			sampleTask.setCreateTime(qcCheckTaskIncome.getCreateTime());
+			sampleTask.setWorkOrderCodeSap(qcCheckTaskIncome.getWorkorderCodeSap());
+			sampleTask.setCreateTime(new Date());
+			sampleTask.setOrderNo(qcCheckTaskIncome.getOrderCode());
 			//查询该物料是否留样
 			QcCheckSampleTask temp = qcCheckSampleTaskMapper.selectQcCheckSampleTask(sampleTask);
 			//未留样则进行留样

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

@@ -23,6 +23,8 @@
         <result property="thirdCheckUserName" column="third_check_user_name"/>
         <result property="thirdCheckResult" column="third_check_result"/>
         <result property="thirdCheckTime" column="third_check_time"/>
+        <result property="sampleUserCode" column="sample_user_code"/>
+        <result property="sampleUserName" column="sample_user_name"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -35,7 +37,7 @@
             id,
             material_name,
             income_batch_no,
-            SUBSTRING ( pow.workorder_code_sap, 4, 12 ) AS work_order_code_sap,
+            work_order_code_sap,
             sample_time,
             sample_num,
             sample_address,
@@ -50,9 +52,10 @@
             third_check_user_code,
             third_check_user_name,
             third_check_result,
-            third_check_time
+            third_check_time,
+            sample_user_code,
+            sample_user_name
         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), task.create_time ,23)  <![CDATA[ = ]]> #{queryDate}
@@ -67,7 +70,7 @@
                 and task.material_name like concat('%', #{materialName}, '%')
             </if>
             <if test="workOrderCodeSap != null and workOrderCodeSap != ''">
-                and SUBSTRING ( pow.workorder_code_sap, 4, 12 ) <![CDATA[ = ]]> #{workOrderCodeSap}
+                and task.work_order_code_sap = #{workOrderCodeSap}
             </if>
         </where>
         order by task.sample_time desc,task.create_time desc
@@ -166,6 +169,12 @@
             <if test="thirdCheckTime != null and thirdCheckTime != ''">
                 third_check_time = #{thirdCheckTime},
             </if>
+            <if test="sampleUserCode != null and sampleUserCode != ''">
+                sample_user_code = #{sampleUserCode},
+            </if>
+            <if test="sampleUserName != null and sampleUserName != ''">
+                sample_user_name = #{sampleUserName},
+            </if>
             update_time = getDate()
         </set>
         where id = #{id}
@@ -238,6 +247,7 @@
             material_name,
             income_batch_no,
             order_no,
+            work_order_code_sap,
             create_time
         )
         VALUES
@@ -246,6 +256,7 @@
             #{materialName},
             #{incomeBatchNo},
             #{orderNo},
+            #{workOrderCodeSap},
             #{createTime}
         )
     </insert>
@@ -253,7 +264,7 @@
     <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}
+        WHERE material_name = #{materialName} AND work_order_code_sap = #{workOrderCodeSap}
     </select>