|
|
@@ -1319,6 +1319,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String InspectMode = jsonObj.optString("Inspector", "");
|
|
|
String WorkOrderNo = jsonObj.optString("WorkOrderNo", "");
|
|
|
|
|
|
+ String wo = WorkOrderNo.contains("/") ? WorkOrderNo.split("/")[0] : WorkOrderNo;
|
|
|
+ String line = WorkOrderNo.contains("/") ? WorkOrderNo.split("/")[1] : "";
|
|
|
+
|
|
|
if(MeshCode ==null){
|
|
|
rmap.put("Result","NG");
|
|
|
rmap.put("Meassage","钢网/刮刀编号不能为空");
|
|
|
@@ -1338,7 +1341,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
paramsMap.put("su_stid",rs.getString("st_id"));
|
|
|
paramsMap.put("su_stcode",MeshCode);
|
|
|
paramsMap.put("su_linecode",rs.getString("st_line"));
|
|
|
- paramsMap.put("su_usemacode",WorkOrderNo);
|
|
|
+ paramsMap.put("su_usemacode",wo);
|
|
|
paramsMap.put("su_usedate",InspectTime);
|
|
|
if(usestatus.contains("在库")){
|
|
|
paramsMap.put("su_status","领用");
|
|
|
@@ -1352,8 +1355,17 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("Meassage", stKind+"状态: " + jsonObj.optString("TestResult", "") + "不可领用");
|
|
|
return rmap;
|
|
|
}
|
|
|
+
|
|
|
+ if(line == null && line.isEmpty()){
|
|
|
+ rmap.put("Result", "NG");
|
|
|
+ rmap.put("Meassage", "领用操作须在工单后加线体名称,如XXX/SMTA");
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ paramsMap.put("su_linecode", line);
|
|
|
+ baseDao.updateByCondition("stencil", "st_line = '"+line+"'", "st_code='" + MeshCode + "'");
|
|
|
}else if(usestatus.contains("出库")){
|
|
|
paramsMap.put("su_status","归还");
|
|
|
+ baseDao.updateByCondition("stencil", "st_line = ''", "st_code='" + MeshCode + "'");
|
|
|
}
|
|
|
|
|
|
paramsMap1.put("std_class",InspectMode);
|
