|
@@ -3507,7 +3507,7 @@ public class MesProductRecordController extends BaseController {
|
|
|
|
|
|
|
|
String sn = "";
|
|
String sn = "";
|
|
|
String oprno = "OP170A"; // 与 ytresult3 一致;请求体有 oprno 仍以请求为准
|
|
String oprno = "OP170A"; // 与 ytresult3 一致;请求体有 oprno 仍以请求为准
|
|
|
- String lineSn = "XT";
|
|
|
|
|
|
|
+ String lineSn = "CZ060";
|
|
|
|
|
|
|
|
boolean allOk = false;
|
|
boolean allOk = false;
|
|
|
|
|
|
|
@@ -3688,7 +3688,7 @@ public class MesProductRecordController extends BaseController {
|
|
|
|
|
|
|
|
String sn = "";
|
|
String sn = "";
|
|
|
String oprno = "OP170A"; // 螺套两枪兜底
|
|
String oprno = "OP170A"; // 螺套两枪兜底
|
|
|
- String lineSn = "XT";
|
|
|
|
|
|
|
+ String lineSn = "CZ060";
|
|
|
|
|
|
|
|
boolean allOk = false;
|
|
boolean allOk = false;
|
|
|
for (MesProductYtReq mesProductYt : mesProductYts) {
|
|
for (MesProductYtReq mesProductYt : mesProductYts) {
|
|
@@ -5524,7 +5524,7 @@ public class MesProductRecordController extends BaseController {
|
|
|
public String ccdcheck(HttpServletRequest req) {
|
|
public String ccdcheck(HttpServletRequest req) {
|
|
|
// 01;工号;序号(条码);工序名称(工位号);资源名称;设备编码;工治具编码;
|
|
// 01;工号;序号(条码);工序名称(工位号);资源名称;设备编码;工治具编码;
|
|
|
String commandString = req.getParameter("commandString");
|
|
String commandString = req.getParameter("commandString");
|
|
|
- mesLogService.apisave2("OP390","XT",commandString,req);
|
|
|
|
|
|
|
+ mesLogService.apisave2("OP250","CZ060",commandString,req);
|
|
|
|
|
|
|
|
if (commandString == null || commandString.isEmpty()) {
|
|
if (commandString == null || commandString.isEmpty()) {
|
|
|
return CommonUitl.getXml("NG;参数错误;");
|
|
return CommonUitl.getXml("NG;参数错误;");
|
|
@@ -5542,7 +5542,7 @@ public class MesProductRecordController extends BaseController {
|
|
|
}
|
|
}
|
|
|
String sn = commands[2];
|
|
String sn = commands[2];
|
|
|
String oprno = commands[3]; // OP290B
|
|
String oprno = commands[3]; // OP290B
|
|
|
- String lineSn = "XT";
|
|
|
|
|
|
|
+ String lineSn = "CZ060";
|
|
|
String oldOprno = oprno;
|
|
String oldOprno = oprno;
|
|
|
oprno = CommonUitl.formatOprno(oprno);
|
|
oprno = CommonUitl.formatOprno(oprno);
|
|
|
if (StringUtils.isEmpty(sn)) {
|
|
if (StringUtils.isEmpty(sn)) {
|