Browse Source

工单完结审批是也判断是否有必填工序没有确认

hu 4 years ago
parent
commit
ceaee324e1

+ 8 - 0
src/rest/openapi/restcontroller/housekeeperwebapp/workorder/WorkOrder.java

@@ -16,6 +16,7 @@ import org.apache.cxf.ws.security.wss4j.policyvalidators.UsernameTokenPolicyVali
 import org.sqlite.date.DateFormatUtils;
 import p2.p2server.P2Server;
 import p2.pao.*;
+import p2.util.P2AppException;
 import p2.util.P2Exception;
 import workorder.workorder;
 
@@ -695,6 +696,13 @@ public class WorkOrder extends Controller {
                         			 reason = msg.getString("reason");
                         		}
                         	}
+                        	PaoSetRemote ordernodeset = workorderPao.getPaoSet("ordernode");
+
+                    		ordernodeset.setWhere("fisrequirednode =1 and isconfirm=0");
+                    		ordernodeset.reset();
+                    		if(ordernodeset.count()>0) {
+                    			throw new P2AppException("", "还有必填的服务工序没有确认");
+                    		}
                             PaoSetRemote workorder_errormsg = workorderPao.getPaoSet("workorder_errormsg");
                             PaoRemote remote = workorder_errormsg.addAtEnd();
                             remote.setValue("ftype","工单异常",11l);