工单节点更改为保存时验证必填信息

src/rest/openapi/restcontroller/hyworkorder/webapp/hyconfirmationorder/MyHyconfirmationorder.java

@@ -68,31 +68,34 @@ public class MyHyconfirmationorder extends Controller {
 				Rows rows = dbConnect.runSqlQuery(factory.getSQL());
 				RowsMap rowsMap = rows.toRowsMap("frownum");
 				if(pao.getString("ftype").equals("安装调试")) {
-					remote.setValue("FISPRODUCT", pao.getBoolean("FISTITEM"));
-					remote.setValue("FISSHELFLIFE", pao.getBoolean("FISPERIOD"));
+					remote.setValue("FISPRODUCT", pao.getBoolean("FISTITEM"),11l);
+					remote.setValue("FISSHELFLIFE", pao.getBoolean("FISPERIOD"),11l);
 					if(!rowsMap.get("2_1").isEmpty() && rowsMap.get("2_1").get(0).getString("ftext")!=null &&rowsMap.get("2_1").get(0).getString("ftext").length()!=0) {
-						remote.setValue("fnotes", "2-1 确认是否可以在线维修、调试？"+rowsMap.get("2_1").get(0).getString("ftext"));
+						remote.setValue("fnotes", "2-1 确认是否可以在线维修、调试？"+rowsMap.get("2_1").get(0).getString("ftext"),11l);
 					}
 					if(!rowsMap.get("2_2").isEmpty() && rowsMap.get("2_2").get(0).getString("ftext")!=null &&rowsMap.get("2_2").get(0).getString("ftext").length()!=0) {
-						remote.setValue("fnotes2", "2-2 确认是否需要拆卸配件或整拆？（返厂）"+rowsMap.get("2_2").get(0).getString("ftext"));
+						remote.setValue("fnotes2", "2-2 确认是否需要拆卸配件或整拆？（返厂）"+rowsMap.get("2_2").get(0).getString("ftext"),11l);
 					}
 					if(!rowsMap.get("2_3").isEmpty() && rowsMap.get("2_3").get(0).getString("ftext")!=null &&rowsMap.get("2_3").get(0).getString("ftext").length()!=0) {
-						remote.setValue("TREATMENTMEASURES", rowsMap.get("2_3").get(0).getString("ftext"));
+						remote.setValue("TREATMENTMEASURES", rowsMap.get("2_3").get(0).getString("ftext"),11l);
 					}
 					if(!rowsMap.get("2_3").isEmpty() && rowsMap.get("2_3").get(0).getString("ftext")!=null &&rowsMap.get("2_3").get(0).getString("ftext").length()!=0) {
-						remote.setValue("FMAINTENANCECYCLE", rowsMap.get("2_3").get(0).getString("ftext"));
+						remote.setValue("FMAINTENANCECYCLE", rowsMap.get("2_3").get(0).getString("ftext"),11l);
+					}
+					if(!rowsMap.get("3_1").isEmpty()) {
+						remote.setValue("fispaid", rowsMap.get("3_1").get(0).getString("fispaid"),11l);
 					}
 					if(!rowsMap.get("3_1").isEmpty() && rowsMap.get("3_1").get(0).getString("ftext")!=null &&rowsMap.get("3_1").get(0).getString("ftext").length()!=0) {
-						remote.setValue("FAMOUNT", rowsMap.get("3_1").get(0).getString("ftext"));
+						remote.setValue("FAMOUNT", rowsMap.get("3_1").get(0).getString("ftext"),11l);
 					}
 					if(!rowsMap.get("3_3").isEmpty() && rowsMap.get("3_3").get(0).getString("ftext")!=null &&rowsMap.get("3_3").get(0).getString("ftext").length()!=0) {
 						remote.setValue("RESULT", rowsMap.get("3_3").get(0).getString("ftext"));
 					}
 					if(!rowsMap.get("4_1").isEmpty() && rowsMap.get("4_1").get(0).getString("ftext")!=null &&rowsMap.get("4_1").get(0).getString("ftext").length()!=0) {
-						remote.setValue("RESULT_MSG", rowsMap.get("4_1").get(0).getString("ftext"));
+						remote.setValue("RESULT_MSG", rowsMap.get("4_1").get(0).getString("ftext"),11l);
 					}
 					if(!rowsMap.get("4_2").isEmpty() && rowsMap.get("4_2").get(0).getString("ftext")!=null &&rowsMap.get("4_2").get(0).getString("ftext").length()!=0) {
-						remote.setValue("FONSITEACCOUNT", rowsMap.get("4_2").get(0).getString("ftext"));
+						remote.setValue("FONSITEACCOUNT", rowsMap.get("4_2").get(0).getString("ftext"),11l);
 					}
 					PaoSetRemote paoSetRemote=pao.getPaoSet("AFTERSERVICEORDER").getPao(0).getPaoSet("HYAFTERSERVICEORDER_TITEM");
 					if(!paoSetRemote.isEmpty()) {
@@ -104,10 +107,10 @@ public class MyHyconfirmationorder extends Controller {
 					}
 				}else if(pao.getString("ftype").equals("安装培训")) {
 					if(!rowsMap.get("2_3").isEmpty() && rowsMap.get("2_3").get(0).getString("ftext")!=null &&rowsMap.get("2_3").get(0).getString("ftext").length()!=0) {
-						remote.setValue("RESULT", rowsMap.get("2_3").get(0).getString("ftext"));
+						remote.setValue("RESULT", rowsMap.get("2_3").get(0).getString("ftext"),11l);
 					}
 					if(!rowsMap.get("3_1").isEmpty() && rowsMap.get("3_1").get(0).getString("ftext")!=null &&rowsMap.get("3_1").get(0).getString("ftext").length()!=0) {
-						remote.setValue("RESULT_MSG", rowsMap.get("3_1").get(0).getString("ftext"));
+						remote.setValue("RESULT_MSG", rowsMap.get("3_1").get(0).getString("ftext"),11l);
 					}
 					PaoSetRemote HYORDERNODE_TITEM=pao.getPaoSet("HYORDERNODE_TITEM");
 					PaoSetRemote HYORDERNODE_TRAINERS=pao.getPaoSet("HYORDERNODE_TRAINERS");

src/rest/openapi/restcontroller/hyworkorder/webapp/hyconfirmationorder/SQL/工单节点明细查询.sql

@@ -1,4 +1,4 @@
-select convert(varchar,t1.frownum)+'_'+convert(varchar,t2.frownum) frownum,ftext from 
+select convert(varchar,t1.frownum)+'_'+convert(varchar,t2.frownum) frownum,ftext,fispaid from 
 (select ROW_NUMBER() OVER (ORDER BY frownum) AS frownum,hyordernodeid from HYORDERNODE where fparentid=$hyworkorderid$ and oneprocessname is not null and  siteid=$siteid$) t1 
 inner join 
-(select dense_rank() over(partition by supid order by frownum) AS frownum,ftext,supid,hyordernodeid from HYORDERNODE where fparentid=$hyworkorderid$ and supid is not null and siteid=$siteid$) t2 on t1.hyordernodeid=t2.supid
+(select dense_rank() over(partition by supid order by frownum) AS frownum,ftext,supid,hyordernodeid,fispaid from HYORDERNODE where fparentid=$hyworkorderid$ and supid is not null and siteid=$siteid$) t2 on t1.hyordernodeid=t2.supid

src/rest/openapi/restcontroller/hyworkorder/webapp/workorder/HyWorkOrder.java

@@ -609,6 +609,9 @@ public class HyWorkOrder extends Controller {
 								if (!fiscomplate.equals("true"))
 									return getReturnObject_err(fiscomplate).toString();
 							} else {
+								String fiscomplate = ordernodePao.fiscomplate();
+								if (!fiscomplate.equals("true"))
+									return getReturnObject_err(fiscomplate).toString();
 								ordernodePao.setValue("isconfirm", false, 11l);
 								ordernodePao.setValue("fstatus", "½øÐÐÖÐ", 11l);
 								Row completeAndTotal = workorderPao.getCompleteAndTotal();