Merge remote-tracking branch 'origin/master'

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

@@ -202,6 +202,15 @@ public class QcCheckTaskIncome extends BaseEntity {
     private String sampleCode;
     private String sampleAql;
     private String reason;
+    private String sfgyswt;//是否供应商问题
+
+    public String getSfgyswt() {
+        return sfgyswt;
+    }
+
+    public void setSfgyswt(String sfgyswt) {
+        this.sfgyswt = sfgyswt;
+    }
 
     public String getSampleAql() {
         return sampleAql;

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

@@ -124,6 +124,15 @@ public class QcCheckUnqualified extends BaseEntity {
     private String qczg;//QC主管
     private String user;
     private String sqr;
+    private String sfgyswt;//是否供应商问题
+
+    public String getSfgyswt() {
+        return sfgyswt;
+    }
+
+    public void setSfgyswt(String sfgyswt) {
+        this.sfgyswt = sfgyswt;
+    }
 
     public String getSqr() {
         return sqr;

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

@@ -797,10 +797,24 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
 			logger.info("qc_check_unqualified:" + n);
             if("1".equals(qcCheckTaskIncome.getStartOA())){
-
+            	this.setOaFunc(unqualified,qcCheckTaskIncome);
-				unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode());
+			}
+            //发送企业微信
+            this.sendWX(qcCheckTaskIncome);
+		}
+		return 1 ;
+	}
+	 /* 首检巡检都是品质异常流程
+	 * 成品的是成品检验控制流程
+	 * 来料的是来料检验不合格流程*/
+	private void setOaFunc(QcCheckUnqualified unqualified,QcCheckTaskIncome qcCheckTaskIncome){
 		//不合格描述
 		unqualified.setRemark(qcCheckTaskIncome.getRemark());
+		if("produce".equals(qcCheckTaskIncome.getTypeCode())){
+			unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt());
+		}else if("material".equals(qcCheckTaskIncome.getTypeCode())){
+			unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode());
+
 			//厂区(小榄固定值)
 			unqualified.setOaFactory("0");
 			//来料类别
@@ -835,14 +849,11 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			unqualified.setQczg("660");
 			//申请人-朱继新
 			unqualified.setSqr("660");
-				unqualified.setUser(updateBy);
+			unqualified.setUser(qcCheckTaskIncome.getUpdateBy());
+		}
+
 		qcCheckUnqualifiedService.updateQcCheckUnqualified(unqualified);
 	}
-            //发送企业微信
-            this.sendWX(qcCheckTaskIncome);
-		}
-		return 1 ;
-	}
 
 	protected void sendWX(QcCheckTaskIncome qcCheckTaskIncome){
 		//发企业微信--------------------开始（跟班组有关）

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

@@ -317,8 +317,8 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
 		mainObject.append(",\"CPBM\":"+detailInfo.getMaterialCode());//产品编码
 		mainObject.append(",\"SQBM\":"+"\"0\"");//0品质保障部
 		mainObject.append(",\"SQR\":"+"\""+SecurityUtils.getUsername()+"\"");//申请人:默认当前用户
-		mainObject.append(",\"SQSJ\":"+"\""+detailInfo.getSupplierCode()+"\"");//申请时间
+		mainObject.append(",\"SQSJ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getCheckTime())+"\"");//申请时间
-		mainObject.append(",\"SCCJ\":"+"\""+detailInfo.getSupplierName()+"\"");//所属车间
+		mainObject.append(",\"SCCJ\":"+"\"162\"");//所属车间
 		mainObject.append(",\"SCPH\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号
 		mainObject.append(",\"SCSL\":"+"\""+detailInfo.getQuality()+"\"");//生产数量
 		mainObject.append(",\"FXDD\":"+"\""+detailInfo.getCheckLoc()+"\"");//发现地点
@@ -328,7 +328,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
 		mainObject.append(",\"PZYCMS\":"+"\""+detailInfo.getRemark()+"\"");//品质异常描述
 		mainObject.append(",\"Notes\":"+"\"\"");//测试备注
 		mainObject.append(",\"SFXYZG\":"+"\"0\"");//*是否需要主管审核 1否  0是
-		mainObject.append(",\"PGZG\":"+"\""+detailInfo.getRemark()+"\"");//QC主管：SFXYZG字段为"是",则此项选择QC主管信息
+		mainObject.append(",\"PGZG\":"+"\"660\"");//QC主管：SFXYZG字段为"是",则此项选择QC主管信息
 		mainObject.append(",\"PGZR\":"+"\"660\"");//质量主管  660：朱继新
 		mainObject.append(",\"SFGYSWT\":"+"\"1\"");//*是否供应商问题 1非供应商问题 0是供应商问题