宁波工单必填服务工序判断更新

src/apps/workorder/workorder.java

@@ -190,10 +190,14 @@ public class workorder extends PaoCust {
 //		if (allcount != count && !getString("ftype").equals("维修")) {
 //			throw new P2AppException("", "还有工序没有确认");
 //		} else {
-		ordernodeset.setWhere("fisrequirednode =1 and isconfirm=0 and supid is not null");
+		ordernodeset.setWhere("fisrequirednode =1 and isconfirm=0 and ischilden=0");
 		ordernodeset.reset();
 		if(ordernodeset.count()>0) {
-			throw new P2AppException("", "还有必填的服务工序【"+ordernodeset.getPao(0).getString("TWOPROCESSNAME")+"】没有确认");
+			if(StringUtils.isBlank(ordernodeset.getPao(0).getString("TWOPROCESSNAME"))) {
+				throw new P2AppException("", "还有必填的服务工序【"+ordernodeset.getPao(0).getString("oneprocessname")+"】没有确认");
+			}else if(StringUtils.isBlank(ordernodeset.getPao(0).getString("oneprocessname"))) {
+				throw new P2AppException("", "还有必填的服务工序【"+ordernodeset.getPao(0).getString("TWOPROCESSNAME")+"】没有确认");
+			}	
 		}
 			DBConnect dbConnect = new DBConnect();
 			/** 质保卡生成 **/
@@ -550,10 +554,14 @@ public class workorder extends PaoCust {
 //        if(!workorder_errormsg.isEmpty()){
 //            throw new P2AppException("","有异常信息未处理");
 //        }
-		ordernodeset.setWhere("fisrequirednode =1 and isconfirm=0 and supid is not null");
+		ordernodeset.setWhere("fisrequirednode =1 and isconfirm=0 and ischilden=0");
 		ordernodeset.reset();
 		if(ordernodeset.count()>0) {
-			throw new P2AppException("", "还有必填的服务工序【"+ordernodeset.getPao(0).getString("TWOPROCESSNAME")+"】没有确认");
+			if(StringUtils.isBlank(ordernodeset.getPao(0).getString("TWOPROCESSNAME"))) {
+				throw new P2AppException("", "还有必填的服务工序【"+ordernodeset.getPao(0).getString("oneprocessname")+"】没有确认");
+			}else if(StringUtils.isBlank(ordernodeset.getPao(0).getString("oneprocessname"))) {
+				throw new P2AppException("", "还有必填的服务工序【"+ordernodeset.getPao(0).getString("TWOPROCESSNAME")+"】没有确认");
+			}	
 		}
 		DBConnect dbConnect = new DBConnect();
 		PaoSetRemote workordertemplate = getPaoSet("WORKORDERTEMPLATE");

src/rest/openapi/restcontroller/housekeeperwebapp/workorder/WorkOrder.java

@@ -698,10 +698,14 @@ public class WorkOrder extends Controller {
                         	}
                         	PaoSetRemote ordernodeset = workorderPao.getPaoSet("ordernode");
 
-                        	ordernodeset.setWhere("fisrequirednode =1 and isconfirm=0 and supid is not null");
+                        	ordernodeset.setWhere("fisrequirednode =1 and isconfirm=0 and ischilden=0");
                     		ordernodeset.reset();
                     		if(ordernodeset.count()>0) {
-                    			throw new P2AppException("", "还有必填的服务工序【"+ordernodeset.getPao(0).getString("TWOPROCESSNAME")+"】没有确认");
+                    			if(StringUtils.isBlank(ordernodeset.getPao(0).getString("TWOPROCESSNAME"))) {
+                    				throw new P2AppException("", "还有必填的服务工序【"+ordernodeset.getPao(0).getString("oneprocessname")+"】没有确认");
+                    			}else if(StringUtils.isBlank(ordernodeset.getPao(0).getString("oneprocessname"))) {
+                    				throw new P2AppException("", "还有必填的服务工序【"+ordernodeset.getPao(0).getString("TWOPROCESSNAME")+"】没有确认");
+                    			}	
                     		}
                             PaoSetRemote workorder_errormsg = workorderPao.getPaoSet("workorder_errormsg");
                             PaoRemote remote = workorder_errormsg.addAtEnd();