Przeglądaj źródła

台州服务单时间格式判断更新

hu 4 lat temu
rodzic
commit
9e336c6c08

+ 8 - 3
src/apps/hyworkorder/hyworkorder.java

@@ -112,16 +112,19 @@ public class hyworkorder extends PaoCust {
 			PaoSetRemote ordernode = getPaoSet("hyordernode");
 			PaoSetRemote workordertemplate = getPaoSet("hyWorkordertemplate");
 			if (!workordertemplate.isEmpty()) {
-
+				System.out.println(222);
 				PaoRemote templatepao = workordertemplate.getPao(0);
 				PaoSetRemote templatenode = templatepao.getPaoSet("hytemplatenode");
 				if (!templatenode.isEmpty()) {
-
+					System.out.println(333);
 					int index = 0;
 					for (int i = 0; i < templatenode.count(); i++) {
+						
 						PaoRemote pao = templatenode.getPao(i);
+						System.out.println(pao.getString("oneprocessname"));
 						PaoSetRemote templatenode2 = pao.getPaoSet("hytemplatenode2");
 						if (templatenode2.isEmpty()) {
+							
 							PaoRemote remote = ordernode.addAtEnd();
 							remote.setValue("FROWNUM", ++index, 11l);
 							remote.setValue("oneprocessname", pao.getString("oneprocessname"), 11l);
@@ -137,6 +140,7 @@ public class hyworkorder extends PaoCust {
 							remote.setValue("FISCOMPLETE", pao.getString("FISCOMPLETE"), 11l);
 
 						} else {
+							System.out.println(555);
 							PaoRemote remote = ordernode.addAtEnd();
 							remote.setValue("FROWNUM", ++index, 11l);
 							remote.setValue("oneprocessname", pao.getString("oneprocessname"), 11l);
@@ -153,6 +157,7 @@ public class hyworkorder extends PaoCust {
 
 							for (int j = 0; j < templatenode2.count(); j++) {
 								PaoRemote templatenode2_pao = templatenode2.getPao(j);
+								System.out.println(templatenode2_pao.getString("twoprocessname"));
 								PaoRemote remote2 = ordernode.addAtEnd();
 								remote2.setValue("FROWNUM", ++index, 11l);
 								remote2.setValue("twoprocessname", templatenode2_pao.getString("twoprocessname"), 11l);
@@ -174,7 +179,7 @@ public class hyworkorder extends PaoCust {
 					}
 				}
 			}
-			// ordernode.save();
+			ordernode.save();
 //            getThisPaoSet().save();
 		} else if (fieldname.equalsIgnoreCase("Installerphone")) {
 			PaoSetRemote installer = getPaoSet("Installer");

+ 2 - 2
src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/Afterserviceorder.java

@@ -377,9 +377,9 @@ public class Afterserviceorder extends Controller {
                     remote.setValue("appsystem",where.getString("appsystem"),11l);
                 if(where.containsKey("errcategory"))
                     remote.setValue("errcategory",where.getString("errcategory"),11l);
-                if(where.containsKey("servicebegindate"))
+                if(where.containsKey("servicebegindate") && where.getString("servicebegindate")!=null && where.getString("servicebegindate").length()!=0)
                     remote.setValue("servicebegindate",where.getString("servicebegindate"),11l);
-                if(where.containsKey("serviceenddate"))
+                if(where.containsKey("serviceenddate") && where.getString("serviceenddate")!=null && where.getString("serviceenddate").length()!=0)
                     remote.setValue("serviceenddate",where.getString("serviceenddate"),11l);