Merge remote-tracking branch 'origin/master'

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

@@ -27,7 +27,7 @@ public class QcCheckTaskIncome extends BaseEntity {
 	private String checkNo;
 
 	private String workorderCode;
-
+    private String workorderCodeSap;
 	/** 来料批次号 */
 	@Excel(name = "批次号")
 	private String incomeBatchNo;
@@ -139,6 +139,14 @@ public class QcCheckTaskIncome extends BaseEntity {
 
 	private String fileList;
 
+	public String getWorkorderCodeSap() {
+		return workorderCodeSap;
+	}
+
+	public void setWorkorderCodeSap(String workorderCodeSap) {
+		this.workorderCodeSap = workorderCodeSap;
+	}
+
 	public String getFileList() {
 		return fileList;
 	}

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

@@ -163,10 +163,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 				qcCheckTaskUser.setCheckManCode(splitCodes[i]);
 				qcCheckTaskUser.setCheckNo(qcCheckTaskIncome.getCheckNo());
 				qcCheckTaskUser.setBelongTo(beLongId);
+				qcCheckTaskUser.setFactoryCode(factoryCode);
+
 				qcCheckTaskUserList.add(qcCheckTaskUser);
 			}
 			//检验人插入
-			qcCheckTaskUserService.insertQcCheckTaskUserList(qcCheckTaskUserList);
+			qcCheckTaskUserService.insertQcCheckTaskUserPDA(qcCheckTaskUserList);
 		}else{//上位机触发
 			qcCheckTaskIncome.setCheckManName("");
 			qcCheckTaskIncome.setCheckManCode("");
@@ -407,14 +409,14 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 
 		return n ;
 	}
-
+    //来料检验不良OA流程
 	private AjaxResult createLLOA(QcCheckTaskIncome qcCheckTaskIncome){
 		//发起来料检验OA流程
 		Map<String, Object> paramMap = new HashMap<>();
 		paramMap.put("user","999999");//提交人工号qcCheckTaskIncome.getUpdateBy()
 		paramMap.put("requestLevel",0);//流程紧急度
-		paramMap.put("requestName","ZL0010-来料检验不合格审批流程(订单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称
+		paramMap.put("requestName","ZL0020-来料检验不合格审批流程(订单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称
-		paramMap.put("workflowId",26258);//该流程对应的唯- workFlowld
+		paramMap.put("workflowId",26234);//该流程对应的唯- workFlowld
 
 		StringBuffer mainObject = new StringBuffer();
 		mainObject.append("{");
@@ -429,13 +431,41 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 		//mainObject.append(",\"memo\":"+"\""+qcCheckTaskIncome.getQuality0()+"\"");//不合格情况描述
 		mainObject.append("}");
 
+		paramMap.put("mainObject",mainObject.toString());
+		logger.info("流程Id 26234:"+ JSONObject.toJSONString(paramMap));
+		AjaxResult oaR = remoteOpenService.OAInspection(paramMap);
+		logger.info("流程Id 26234:"+ JSONObject.toJSONString(oaR));
+		return oaR;
+	}
+	/*生产过程不良OA流程
+	 * PGBCJ 申请部门/SSCJ 所属车间/ZRPSN报检人/GJZ关键字/SCLX生产类型/OEM OEM厂名/DH 单号/DW单位/MEMO01 不合格描述/
+	 * MEMO03 备注/SFXZG 是否需要QC主管审核/PGZG QC主管
+	 * PGZRJL 品管主任*/
+	private AjaxResult createProduceOA(QcCheckTaskIncome qcCheckTaskIncome){
+		//发起来料检验OA流程
+		Map<String, Object> paramMap = new HashMap<>();
+		paramMap.put("user","999999");//提交人工号qcCheckTaskIncome.getUpdateBy()
+		paramMap.put("requestLevel",0);//流程紧急度
+		paramMap.put("requestName","ZL0010-成品检验控制流程(订单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称
+		paramMap.put("workflowId",26258);//该流程对应的唯- workFlowld
+
+		StringBuffer mainObject = new StringBuffer();
+		mainObject.append("{");
+		mainObject.append("\"SSCJ\":"+qcCheckTaskIncome.getFactoryCode());//所属车间
+		mainObject.append(",\"ZRPSN\":"+"\""+qcCheckTaskIncome.getUpdateBy()+"\"");//报检人
+		mainObject.append(",\"OEM\":"+"\""+qcCheckTaskIncome.getFactoryCode()+"\"");//OEM厂名
+		mainObject.append(",\"DH\":"+"\""+qcCheckTaskIncome+"\"");//单号
+		mainObject.append(",\"MEMO01\":"+"\""+qcCheckTaskIncome.getSupplierName()+"\"");//不合格情况描述
+		mainObject.append("}");
+
+
+
 		paramMap.put("mainObject",mainObject.toString());
 		logger.info("流程Id 26258:"+ JSONObject.toJSONString(paramMap));
 		AjaxResult oaR = remoteOpenService.OAInspection(paramMap);
 		logger.info("流程Id 26258:"+ JSONObject.toJSONString(oaR));
 		return oaR;
 	}
-
 	@Override
 	@DS("#header.poolName")
 	public List<QcDefectType> getDefectList(QcDefectType qcDefectType) {
@@ -578,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);
 		}
 
 		//不合格处理
@@ -597,7 +629,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			if("material".equals(qcCheckTaskIncome.getTypeCode())) {
 				oaR = this.createLLOA(qcCheckTaskIncome);
 			}else if("produce".equals(qcCheckTaskIncome.getTypeCode())){
-
+				oaR = this.createProduceOA(qcCheckTaskIncome);
 			}else if("product".equals(qcCheckTaskIncome.getTypeCode())) {
 
 			}

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

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.StringUtils;
 import com.op.common.core.utils.uuid.IdUtils;
@@ -70,7 +71,7 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService {
 	/**
 	 * 修改来料检验任务--检查人
 	 *
-	 * @param qcCheckTaskUser 来料检验任务--检查人
+	 * @param qcCheckTaskUserList 来料检验任务--检查人
 	 * @return 结果
 	 */
 	@Override
@@ -131,13 +132,23 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService {
 	@Override
 	@DS("#header.poolName")
 	public int insertQcCheckTaskUserList(List<QcCheckTaskUser> qcCheckTaskUserList) {
-		if (CollectionUtils.isEmpty(qcCheckTaskUserList)){
-			return 0;
-		}
 		//获取当前所选工厂
 		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
 		String key = "#header.poolName";
-		String 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){
@@ -154,4 +165,6 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService {
 	public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo) {
 		return qcCheckTaskUserMapper.selectQcCheckTaskUserByBelongTo(belongTo);
 	}
+
+
 }

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

@@ -150,7 +150,7 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 				qcCheckTaskUserList.add(qcCheckTaskUser);
 			}
             //检验人插入
-			qcCheckTaskUserService.insertQcCheckTaskUserList(qcCheckTaskUserList);
+			qcCheckTaskUserService.insertQcCheckTaskUserPDA(qcCheckTaskUserList);
 		}else{//上位机触发
 			qcCheckTaskWarehousing.setCheckManName("");
 			qcCheckTaskWarehousing.setCheckManCode("");
@@ -250,5 +250,4 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 		return qcCheckTaskWarehousingMapper.getQcListLoc(qcCheckTaskWarehousing);
 	}
 
-
 }

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}

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

@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="factoryCode"	column="factory_code"	/>
         <result property="delFlag"	column="del_flag"	/>
         <result property="checkType"	column="check_type"	/>
+        <result property="workorderCodeSap"	column="workorderCodeSap"	/>
 
         <result property="aNoOkquality"	column="aNoOkquality"	/>
         <result property="bNoOkquality"	column="bNoOkquality"	/>
@@ -255,10 +256,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                qct.check_status, qct.check_man_code,qct.check_man_name, qct.check_time, qct.check_result,
                qct.status,qct.create_by,qct.create_time,qct.check_type,
                qct.noOk_quality,qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality,qct.sample_quality
+              ,pow.workorder_code_sap workorderCodeSap
         from qc_check_task qct
         left join qc_check_task_user qctu on qctu.belong_to = qct.record_id
+        left join pro_order_workorder pow on pow.workorder_code = qct.order_no
         <where>
-            and qct.del_flag = '0'
+            and qct.del_flag = '0'  and  pow.del_flag = '0'
             <if test="checkType != null  and checkType != ''"> and qct.check_type = #{checkType}</if>
             <if test="checkManCode != null  and checkManCode != ''"> and qctu.check_man_code = #{checkManCode}</if>
             <if test="checkStatus != null  and checkStatus != ''"> and qct.check_status in (${checkStatus})</if>

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

@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				   )ymdms
 		from qc_check_task qct
 		left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to
-		where qct.order_no = #{orderNo} and qct.check_type = 'checkTypeSCXJ'
+		where qct.order_no = #{orderNo} and qct.check_type = 'checkTypeSCXJ' and qct.check_status = '2'
 		order by qctd.create_time
 
 	</select>