质量任务接口修改2

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

@@ -82,4 +82,6 @@ public interface QcCheckUnqualifiedMapper {
 	int updateWorkOrderBatchStatus(QcCheckTaskIncome qcCheckTaskIncome);
 
     List<QcCheckTaskIncome> getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
+
+	void updatePutStatus(QcCheckTaskIncome qcCheckTaskIncome);
 }

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

@@ -68,4 +68,6 @@ public interface IQcCheckTaskUserService {
 	 * 根据任务编号查询检验人
 	 */
 	public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo);
+
+	public int  insertQcCheckTaskUserPDA(List<QcCheckTaskUser> qcCheckTaskUserList);
 }

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

@@ -168,7 +168,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 				qcCheckTaskUserList.add(qcCheckTaskUser);
 			}
 			//检验人插入
-			qcCheckTaskUserService.insertQcCheckTaskUserList(qcCheckTaskUserList);
+			qcCheckTaskUserService.insertQcCheckTaskUserPDA(qcCheckTaskUserList);
 		}else{//上位机触发
 			qcCheckTaskIncome.setCheckManName("");
 			qcCheckTaskIncome.setCheckManCode("");
@@ -608,7 +608,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			qcCheckTaskIncome.setStatus("2");
 			qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome);
 		}else if("product".equals(qcCheckTaskIncome.getTypeCode())){
-
+            /**wms_product_put-->check_status->1**/
+			qcCheckTaskIncome.setStatus("2");
+			qcCheckUnqualifiedMapper.updatePutStatus(qcCheckTaskIncome);
 		}
 
 		//不合格处理

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

@@ -132,20 +132,23 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService {
 	@Override
 	@DS("#header.poolName")
 	public int insertQcCheckTaskUserList(List<QcCheckTaskUser> qcCheckTaskUserList) {
-		if (CollectionUtils.isEmpty(qcCheckTaskUserList)){
-			return 0;
-		}
-		String factoryCode = "";
-		if(StringUtils.isNotBlank(qcCheckTaskUserList.get(0).getFactoryCode())){
-			DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskUserList.get(0).getFactoryCode());
-			factoryCode= qcCheckTaskUserList.get(0).getFactoryCode();
-		}else{
 		//获取当前所选工厂
 		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
 		String key = "#header.poolName";
-			factoryCode = request.getHeader(key.substring(8)).replace("ds_","");
+		String factoryCode = request.getHeader(key.substring(8)).replace("ds_","");
+		return this.insertTaskUsers(qcCheckTaskUserList,factoryCode);
+	}
+	@Override
+	public int insertQcCheckTaskUserPDA(List<QcCheckTaskUser> qcCheckTaskUserList) {
+		DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskUserList.get(0).getFactoryCode());
+		String factoryCode= qcCheckTaskUserList.get(0).getFactoryCode();
+		return this.insertTaskUsers(qcCheckTaskUserList,factoryCode);
 	}
 
+	private int insertTaskUsers(List<QcCheckTaskUser> qcCheckTaskUserList,String factoryCode){
+		if (CollectionUtils.isEmpty(qcCheckTaskUserList)){
+			return 0;
+		}
 		//遍历赋值
 		Date nowTime = DateUtils.getNowDate();
 		for (QcCheckTaskUser qcCheckTaskUser : qcCheckTaskUserList){
@@ -162,4 +165,6 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService {
 	public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo) {
 		return qcCheckTaskUserMapper.selectQcCheckTaskUserByBelongTo(belongTo);
 	}
+
+
 }

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

@@ -118,17 +118,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by product_date desc
 	</select>
 	<select id="getProductWorkOrder" resultType="com.op.quality.domain.QcCheckTaskIncome">
-		select work_order orderNo,
+		select wpp.work_order orderNo,
-			   product_name materialName,
+			wpp.product_name materialName,
-			   product_code materialCode,
+			wpp.product_code materialCode,
-			   batch_number incomeBatchNo,
+			wpp.batch_number incomeBatchNo,
-			   plan_quantity quality,
+			wpp.plan_quantity quality,
-			   status,
+			wpp.unit_of_measure unit,
-			   create_time incomeTime
+			wpp.status,
-		from wms_product_put
+			wpp.create_time incomeTime,
+			mrw.workorder_code workorderCode
+		from wms_product_put wpp
+		left join mes_report_work mrw on wpp.work_order = mrw.report_code
 		where 1=1
-		<if test="orderNo != null">and work_order like concat like ('%',#{orderNo})</if>
+		<if test="orderNo != null">and wpp.work_order like concat like ('%',#{orderNo})</if>
-		order by create_time desc
+		order by wpp.create_time desc
 	</select>
 
 	<insert id="insertQcCheckUnqualified" parameterType="QcCheckUnqualified">
@@ -203,6 +206,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="updateWorkOrderBatchStatus">
 		update pro_order_workorder_batch set qc_status = #{status} where batch_code = #{incomeBatchNo}
 	</update>
+	<update id="updatePutStatus">
+		update wms_product_put set check_status = #{status} where batch_number = #{incomeBatchNo}
+	</update>
 
 	<delete id="deleteQcCheckUnqualifiedById" parameterType="String">
 		delete from qc_check_unqualified where id = #{id}