返修区修改

src/main/java/com/jeesite/modules/mes/web/MesRepairQualityController.java

@@ -223,9 +223,9 @@ public class MesRepairQualityController extends BaseController {
 			pp.setContent("OK");
 			mesProductRecordService.save(pp);
 
-			String repairItemId = "18565249649801748481111";
+			String repairItemId = "18565249649801748481111-111";
 			if(mesRepair.getItemId().equals(repairItemId)){ // 底护板更换
-				String[] qmoprnos = new String[]{"OP330","OP360","OP370","OP380","OP390","OP400","OP410"};
+				String[] qmoprnos = new String[]{"OP430", "OP440", "OP450", "OP460", "OP470", "OP480", "OP490", "OP500", "OP510", "OP520", "OP550"};
 				for (String op:qmoprnos){
 					// 返回工位改成UDF
 					MesProductRecord mesProductRecord2 = new MesProductRecord();
@@ -259,8 +259,10 @@ public class MesRepairQualityController extends BaseController {
 					mesProductRecord2.setOprno(cpoprno);
 					mesProductRecord2.setCraft("100000");
 					MesProductRecord pp2 = mesProductRecordService.findInfo(mesProductRecord2);
-					pp2.setContent("UDF");
-					mesProductRecordService.save(pp2);
+					if(!ObjectUtils.isEmpty(pp2)){
+						pp2.setContent("UDF");
+						mesProductRecordService.save(pp2);
+					}
 				}
 				if("1".equals(mesRepairItems.getIsYl())){
 					String yloprno = "OP460";
@@ -269,8 +271,10 @@ public class MesRepairQualityController extends BaseController {
 					mesProductRecord2.setOprno(yloprno);
 					mesProductRecord2.setCraft("100000");
 					MesProductRecord pp2 = mesProductRecordService.findInfo(mesProductRecord2);
-					pp2.setContent("UDF");
-					mesProductRecordService.save(pp2);
+					if(!ObjectUtils.isEmpty(pp2)){
+						pp2.setContent("UDF");
+						mesProductRecordService.save(pp2);
+					}
 				}
 			}
 		}

src/main/resources/config/application.yml

@@ -57,8 +57,8 @@ jdbc:
 #  url: jdbc:mysql://127.0.0.1:3307/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
   url: jdbc:mysql://192.168.21.99:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_x13?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-  username: mescloud
-  password: 8neywEN86NLam3ts
+#  username: mescloud
+#  password: 8neywEN86NLam3ts
 #  username: root
 #  password: 123456
 #