添加中箱称重接口和卡通箱称重接口

src/main/java/com/uas/eis/entity/HelperType.java

@@ -38,6 +38,8 @@ public enum HelperType {
     GetHashValue("GetHashValue","获取SN对应的HashValue"),
     GetCRBValue("GetCRBValue","获取SN对应的HashValue"),
     Weigh("Weigh","添加称重接口"),
+    WeighMidBox("WeighMidBox","添加中箱称重接口"),
+    WeighCarton("WeighCarton","添加卡通箱称重接口"),
     GetEDISN("GetEDISN","获取EDI的SN进行召回重置"),
     GetMechRevoKey("GetMechRevoKey","获取Key信息"),
     GetTestRevoKey("GetTestRevoKey","获取Key信息"),

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -199,6 +199,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case Weigh:
 				remap = Weigh(json,AE_MASTER);
 				break;
+			case WeighMidBox:
+				remap = WeighMidBox(json,AE_MASTER);
+				break;
+			case WeighCarton:
+				remap = WeighCarton(json,AE_MASTER);
+				break;
 			default:
 				err = -1;
 				break;
@@ -290,7 +296,137 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap1.put("maxWeight",obj[1].toString());
 			rmap1.put("machineModel","");
 			rmap.put("dataInfo",rmap1);
-			return SetStepFinish(obj[2].toString(), iSource, iSN, "", "OK", iUserCode, "",Master);
+			//return SetStepFinish(obj[2].toString(), iSource, iSN, "", "OK", iUserCode, "",Master);
+			return rmap;
+		}else{
+			oErrMessage = "未设置标准重量";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+	}
+
+	public Map<Object,Object> WeighMidBox(JSONObject map,String Master) {
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String oErrMessage="";
+		String iSN="";
+		String iSource="";
+		String weight="";
+		String iUserCode="";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		if(map.get("iSource")==null){
+			oErrMessage = "工序不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		if(map.get("iUserCode")==null){
+			oErrMessage = "人员编号不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		if(map.get("weight")==null){
+			oErrMessage = "重量不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		iSN=map.get("iSN").toString();
+		iSource=map.get("iSource").toString();
+		iUserCode=map.get("iUserCode").toString();
+		weight=map.get("weight").toString().replaceAll("KG","");
+		Object[] obj = baseDao.getFieldsDataByCondition(Master+".makeserial left join "+Master+".product on pr_code=ms_prodcode","pr_midboxminweight,pr_midboxmaxweight,ms_makecode","ms_id =(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
+		if(obj[0]!=null&&obj[1]!=null){
+			//不在设置的重量范围内
+			if(Double.parseDouble(weight)<Double.parseDouble(obj[0].toString())||Double.parseDouble(weight)>Double.parseDouble(obj[1].toString())){
+				rmap.put("code",-1);
+				rmap.put("message","SN["+iSN+"]重量为"+weight+",不符合重量范围"+obj[0]+"-"+obj[1]);
+				Map<String, String> rmap1 = new HashMap<String, String>();
+				rmap1.put("minWeight",obj[0].toString());
+				rmap1.put("maxWeight",obj[1].toString());
+				rmap1.put("machineModel","");
+				rmap.put("dataInfo",rmap1);
+				return rmap;
+			}
+
+			rmap.put("message","SN["+iSN+"]重量为"+weight+",符合重量范围"+obj[0]+"-"+obj[1]+",称重通过");
+			Object ms_id=baseDao.getFieldDataByCondition(Master+".makeserial","max(ms_id)","ms_sncode='"+iSN+"'");
+			baseDao.execute("update "+Master+".makeserial set MS_MIDBOXWEIGHT ='"+weight+"' where ms_id="+ms_id);
+
+			Map<String, String> rmap1 = new HashMap<String, String>();
+			rmap1.put("minWeight",obj[0].toString());
+			rmap1.put("maxWeight",obj[1].toString());
+			rmap1.put("machineModel","");
+			rmap.put("dataInfo",rmap1);
+			return rmap;
+		}else{
+			oErrMessage = "未设置标准重量";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+	}
+
+	public Map<Object,Object> WeighCarton(JSONObject map,String Master) {
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String oErrMessage="";
+		String iSN="";
+		String iSource="";
+		String weight="";
+		String iUserCode="";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		if(map.get("iSource")==null){
+			oErrMessage = "工序不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		if(map.get("iUserCode")==null){
+			oErrMessage = "人员编号不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		if(map.get("weight")==null){
+			oErrMessage = "重量不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		iSN=map.get("iSN").toString();
+		iSource=map.get("iSource").toString();
+		iUserCode=map.get("iUserCode").toString();
+		weight=map.get("weight").toString().replaceAll("KG","");
+		Object[] obj = baseDao.getFieldsDataByCondition(Master+".makeserial left join "+Master+".product on pr_code=ms_prodcode","pr_cartonminw,pr_cartonmaxw,ms_makecode","ms_id =(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
+		if(obj[0]!=null&&obj[1]!=null){
+			//不在设置的重量范围内
+			if(Double.parseDouble(weight)<Double.parseDouble(obj[0].toString())||Double.parseDouble(weight)>Double.parseDouble(obj[1].toString())){
+				rmap.put("code",-1);
+				rmap.put("message","卡通箱["+iSN+"]重量为"+weight+",不符合重量范围"+obj[0]+"-"+obj[1]);
+				Map<String, String> rmap1 = new HashMap<String, String>();
+				rmap1.put("minWeight",obj[0].toString());
+				rmap1.put("maxWeight",obj[1].toString());
+				rmap1.put("machineModel","");
+				rmap.put("dataInfo",rmap1);
+				return rmap;
+			}
+
+			rmap.put("message","卡通箱["+iSN+"]重量为"+weight+",符合重量范围"+obj[0]+"-"+obj[1]+",称重通过");
+			Object pa_id=baseDao.getFieldDataByCondition(Master+".package","max(pa_id)","pa_outboxcode='"+iSN+"'");
+			if(pa_id==null){
+				rmap.put("code",-1);
+				rmap.put("message","卡通箱["+iSN+"]不存在");
+				return rmap;
+			}
+			baseDao.execute("update "+Master+".package set PA_WEIGHT ='"+weight+"' where pa_outboxcode='"+iSN+"'");
+
+			Map<String, String> rmap1 = new HashMap<String, String>();
+			rmap1.put("minWeight",obj[0].toString());
+			rmap1.put("maxWeight",obj[1].toString());
+			rmap1.put("machineModel","");
+			rmap.put("dataInfo",rmap1);
+			return rmap;
 		}else{
 			oErrMessage = "未设置标准重量";
 			rmap.put("oErrMessage",oErrMessage);