瀏覽代碼

CCD修改

liuwei 2 天之前
父節點
當前提交
a92118c35c

+ 2 - 2
src/main/java/com/jeesite/modules/mes/service/MesProductCcdService.java

@@ -190,7 +190,7 @@ public class MesProductCcdService extends CrudService<MesProductCcdDao, MesProdu
 
 		String sn = parts[2];	//序号
 		String oprno = parts[3]; // OP290B
-		String lineSn = "XT";	//产线编号
+		String lineSn = "CZ060";	//产线编号
 		String title = parts[4];//设备名称
 		oprno = CommonUitl.formatOprno(oprno);
 		if(StringUtils.isEmpty(sn)){
@@ -256,7 +256,7 @@ public class MesProductCcdService extends CrudService<MesProductCcdDao, MesProdu
 
 		String sn = parts[2];
 		String oprno = parts[3];
-		String lineSn = "XT";
+		String lineSn = "CZ060";
 		String result = parts[7];
 		String userCode = parts[1];
 		String craft = "100000";

+ 4 - 4
src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

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