系统升级

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

@@ -825,7 +825,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			//发现地点
 			unqualified.setCheckLoc(qcCheckTaskIncome.getCheckLoc());
 			//是否需要主管审核
-			unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt());
+			unqualified.setSfxyzg(qcCheckTaskIncome.getSfxyzg());
 			if(qcCheckTaskIncome.getSfgyswt().equals("0")){//是
 				//qc主管
 				unqualified.setPgzg(qcCheckTaskIncome.getPgzg());
@@ -834,6 +834,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			}
 			//是否供应商问题
 			unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt());
+			unqualified.setOaFactoryF(qcCheckTaskIncome.getOaFactoryF());
 
 		}else if("material".equals(qcCheckTaskIncome.getTypeCode())){
 			unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode());
@@ -859,7 +860,8 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			//来料数量
 			unqualified.setQuality(qcCheckTaskIncome.getQuality().toString());
 			//来料单位
-			unqualified.setUnit(qcCheckTaskIncome.getUnit());
+			//CAR:0 PC:1 其它：2 吨：3 千克：4
+			unqualified.setUnit(getConvertUnit(qcCheckTaskIncome.getUnit()));
 			//检验编号
 			unqualified.setCheckNo(qcCheckTaskIncome.getCheckNo());
 			//仓储报检人-李爱娟
@@ -931,6 +933,15 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			//发企业微信--------------------结束
 		}
 	}
+	//CAR:0 PC:1 其它：2 吨：3 千克：4
+	protected String getConvertUnit(String unit){
+		String unitOa= "";
+		switch (unit) {
+			case "ST": unitOa="1";
+			default: unitOa="1";
+		}
+		return unitOa;
+	}
 
 	protected String getSampleQua(QcCheckTaskIncome qcCheckTaskIncome){
 		String sampleQuaStr = "";
@@ -993,4 +1004,9 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	public SysUser getOaUserId(SysUser getUserIdList) {
 		return qcCheckTaskIncomeMapper.getOaUserId(getUserIdList);
 	}
+
+	public static void main(String args[]){
+		QcCheckTaskIncomeServiceImpl impl = new QcCheckTaskIncomeServiceImpl();
+		System.out.println(impl.getConvertUnit("ST"));
+	}
 }