Merge remote-tracking branch 'Gogs/develop' into develop

src/apps/hyworkorder/hyworkorder.java

@@ -140,7 +140,7 @@ public class hyworkorder extends PaoCust {
 							remote.setValue("FISCOMPLETE", pao.getString("FISCOMPLETE"), 11l);
 							remote.setValue("FISADDTRAINING", pao.getString("FISADDTRAINING"), 11l);
 							remote.setValue("FISADDTRAININGTITEM", pao.getString("FISADDTRAININGTITEM"), 11l);
-
+							remote.setValue("FISPAID", pao.getString("FISPAID"), 11l);
 						} else {
 							System.out.println(555);
 							PaoRemote remote = ordernode.addAtEnd();
@@ -158,7 +158,7 @@ public class hyworkorder extends PaoCust {
 							remote.setValue("FISCOMPLETE", pao.getString("FISCOMPLETE"), 11l);
 							remote.setValue("FISADDTRAINING", pao.getString("FISADDTRAINING"), 11l);
 							remote.setValue("FISADDTRAININGTITEM", pao.getString("FISADDTRAININGTITEM"), 11l);
-							
+							remote.setValue("FISPAID", pao.getString("FISPAID"), 11l);
 							for (int j = 0; j < templatenode2.count(); j++) {
 								PaoRemote templatenode2_pao = templatenode2.getPao(j);
 								System.out.println(templatenode2_pao.getString("twoprocessname"));
@@ -179,6 +179,7 @@ public class hyworkorder extends PaoCust {
 								remote2.setValue("FISCOMPLETE", templatenode2_pao.getString("FISCOMPLETE"), 11l);
 								remote2.setValue("FISADDTRAINING", templatenode2_pao.getString("FISADDTRAINING"), 11l);
 								remote2.setValue("FISADDTRAININGTITEM", templatenode2_pao.getString("FISADDTRAININGTITEM"), 11l);
+								remote2.setValue("FISPAID", templatenode2_pao.getString("FISPAID"), 11l);
 							}
 						}
 					}

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/Afterserviceorder.java

@@ -356,7 +356,7 @@ public class Afterserviceorder extends Controller {
                 	}
                 	 remote.setValue("servicetype",where.getString("servicetype"),11l); 
                 }     
-                if(where.containsKey("fsonum"))
+                if(where.containsKey("fsonum") && !StringUtils.isBlank(where.getString("fsonum")) && !where.getString("fsonum").equalsIgnoreCase("null"))
                     remote.setValue("fsonum",where.getString("fsonum"),11l);
                 if(where.containsKey("fprovince"))
                     remote.setValue("fprovince",where.getString("fprovince"),11l);

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

@@ -71,10 +71,10 @@ public class MyHyconfirmationorder extends Controller {
 					remote.setValue("FISPRODUCT", pao.getBoolean("FISTITEM"));
 					remote.setValue("FISSHELFLIFE", pao.getBoolean("FISPERIOD"));
 					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", rowsMap.get("2_1").get(0).getString("ftext"));
+						remote.setValue("fnotes", "2-1 确认是否可以在线维修、调试？"+rowsMap.get("2_1").get(0).getString("ftext"));
 					}
 					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", rowsMap.get("2_2").get(0).getString("ftext"));
+						remote.setValue("fnotes2", "2-2 确认是否需要拆卸配件或整拆？（返厂）"+rowsMap.get("2_2").get(0).getString("ftext"));
 					}
 					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"));

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

@@ -170,11 +170,11 @@ public class HyWorkOrder extends Controller {
 						String[] from_nodes = { "frownum", "oneprocessname", "twoprocessname", "operating",
 								"operatingtime", "fnotes", "ownerid", "supid", "ischilden", "isconfirm", "fisupload",
 								"fisaddtitem", "fiscomplete", "fisOperator", "fistext", "fisconfirmation",
-								"fiscontract","confirmation","fisaddtraining","fisaddtrainingtitem"};
+								"fiscontract","confirmation","fisaddtraining","fisaddtrainingtitem","fispaid"};
 						String[] to_nodes = { "frownum", "oneprocessname", "twoprocessname", "operating",
 								"operatingtime", "fnotes", "hyordernodeid", "supid", "ischilden", "isconfirm",
 								"fisupload", "fisaddtitem", "fiscomplete", "fisOperator", "fistext", "fisconfirmation",
-								"fiscontract","confirmation","fisaddtraining","fisaddtrainingtitem"};
+								"fiscontract","confirmation","fisaddtraining","fisaddtrainingtitem","fispaid"};
 						for (int i = 0; i < ordernode.count(); i++) {
 
 							PaoRemote pao = ordernode.getPao(i);
@@ -236,11 +236,11 @@ public class HyWorkOrder extends Controller {
 							String[] from_nodes2 = { "frownum", "oneprocessname", "twoprocessname", "operating",
 									"operatingtime", "fnotes", "ownerid", "supid", "ischilden", "isconfirm",
 									"fisupload", "fisaddtitem", "fiscomplete", "fisOperator", "fistext",
-									"fisconfirmation", "fiscontract","confirmation","fisaddtraining","fisaddtrainingtitem"};
+									"fisconfirmation", "fiscontract","confirmation","fisaddtraining","fisaddtrainingtitem","fispaid"};
 							String[] to_nodes2 = { "frownum", "oneprocessname", "twoprocessname", "operating",
 									"operatingtime", "fnotes", "hyordernodeid", "supid", "ischilden", "isconfirm",
 									"fisupload", "fisaddtitem", "fiscomplete", "fisOperator", "fistext",
-									"fisconfirmation", "fiscontract","confirmation","fisaddtraining","fisaddtrainingtitem"};
+									"fisconfirmation", "fiscontract","confirmation","fisaddtraining","fisaddtrainingtitem","fispaid"};
 							for (int j = 0; j < ordernode2.count(); j++) {
 								PaoRemote pao1 = ordernode2.getPao(j);
 								Row row1 = getrow(from_nodes2, to_nodes2, pao1);

src/rest/openapi/restcontroller/hyworkorder/webapp/workorder/SQL/工单状态统计.sql

@@ -1,5 +1,10 @@
-DECLARE @hrid nvarchar(50)=$hrid$,@siteid nvarchar(20)=$siteid$,@tostart int =0,@starting int=0,@complete int=0,@qualitycard int=0,@tostop int=0
+DECLARE @hrid nvarchar(50)=$hrid$,@siteid nvarchar(20)=$siteid$,@waiting int=0,@tostart int =0,@starting int=0,@complete int=0,@qualitycard int=0,@tostop int=0
 
+
+select @waiting=count(1)
+from hyWorkorder t
+where EXISTS(select 1 from hyworkorder_team t1 where t1.hyworkernum=@hrid and t1.fparentid=t.hyWorkorderid) and t.siteid=@siteid
+  and t.fstatus='´ý½Óµ¥'
 select @tostart=count(1)
 from hyWorkorder t
 where EXISTS(select 1 from hyworkorder_team t1 where t1.hyworkernum=@hrid and t1.fparentid=t.hyWorkorderid) and t.siteid=@siteid
@@ -21,4 +26,4 @@ from hyWorkorder t
 where EXISTS(select 1 from hyworkorder_team t1 where t1.hyworkernum=@hrid and t1.fparentid=t.hyWorkorderid) and t.siteid=@siteid
   and t.fstatus='Öʱ£¿¨ÉóÅú'
 
-select @tostart tostart,@starting starting,@complete complete,@tostop tostop,@qualitycard qualitycard
+select @waiting waiting,@tostart tostart,@starting starting,@complete complete,@tostop tostop,@qualitycard qualitycard

src/rest/openapi/restcontroller/hyworkorder/webapp/workorder/SQL/工单节点详情查询.sql

@@ -22,7 +22,8 @@ select t.frownum,(isnull(t.oneprocessname,'')+isnull(t.twoprocessname,'')) conte
        t4.ffiscontract,
        t4.ffisconfirmation,
        t.fisaddtraining,
-       t.fisaddtrainingtitem
+       t.fisaddtrainingtitem,
+        t.fispaid
 from hyordernode t
          join hyWorkorder t3 on t3.hyWorkorderid=t.fparentid
          left join hyworker t1 on t1.hyworkernum=t.Operator