|
|
@@ -664,6 +664,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
paramsMap.put("spl_operator", MachineSN);
|
|
|
paramsMap.put("spl_barcode", PasteSN);
|
|
|
// paramsMap.put("spl_user_count", "spl_user_count");
|
|
|
+ paramsMap.put("spl_linecode", suLine);
|
|
|
paramsMap.put("spl_equipment", MachineType);
|
|
|
paramsMap.put("spl_sysname", MachineSN);
|
|
|
paramsMap.put("spl_makecode", wo);
|
|
|
@@ -1401,6 +1402,15 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
paramsMap.put("su_ensiond",jsonObj.optString("Tension4", ""));
|
|
|
paramsMap.put("su_ensione",jsonObj.optString("Tension5", ""));
|
|
|
|
|
|
+ String ensiona = jsonObj.optString("Tension1", "");
|
|
|
+ String ensionb = jsonObj.optString("Tension2", "");
|
|
|
+ String ensionc = jsonObj.optString("Tension3", "");
|
|
|
+ String ensiond = jsonObj.optString("Tension4", "");
|
|
|
+ String ensione = jsonObj.optString("Tension5", "");
|
|
|
+ baseDao.updateByCondition("stencil", "ST_ENSIONA = '"+ensiona+"',ST_ENSIONB = '"+ensionb+"'," +
|
|
|
+ "ST_ENSIONC = '"+ensionc+"',ST_ENSIOND = '"+ensiond+"',ST_ENSIONE = '"+ensione+"'"
|
|
|
+ , "st_code='" + MeshCode + "'");
|
|
|
+
|
|
|
paramsMap1.put("STD_VALUE4",jsonObj.optString("HoleResult", ""));
|
|
|
paramsMap1.put("STD_VALUE5",jsonObj.optString("TensionResult", ""));
|
|
|
paramsMap1.put("STD_VALUE6",jsonObj.optString("InspectResult", ""));
|