海盐优化 2021-12-10 14:43

src/apps/hyordernode/hyordernode.java

@@ -86,14 +86,13 @@ public class hyordernode extends PaoCust {
         }
         //是否上传文本
         if(getBoolean("fistext")&&!hyflowworkset.isEmpty()&&hyflowworkset.getPao(0).getBoolean("ffistext")){
-            if(isNull("ftext"))return "请填写完整工序内容:没有添加文本";
+
+            if(isNull("ftext")||getString("ftext").equals("null"))return "请填写完整工序内容:没有添加文本";
         }
         //是否上传合同
         if(getBoolean("fiscontract")&&!hyflowworkset.isEmpty()&&hyflowworkset.getPao(0).getBoolean("ffiscontract")){
             PaoSetRemote doclinks =null;
-
             doclinks = P2Server.getP2Server().getPaoSet("tattachment", P2Server.getP2Server().getSystemUserInfo());
-
             doclinks.setWhere("ownertable='HYORDERNODE' and ownerid="+getInt("hyORDERNODEid")+" and type='合同'");
             doclinks.reset();
             if(doclinks.isEmpty())return "请填写完整工序内容:合同没有上传";

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

@@ -157,6 +157,9 @@ public class MyHyconfirmationorder extends Controller {
             if(where.containsKey("nextreturndate")){
                 pao.setValue("nextreturndate",where.getString("nextreturndate"),11l);
             }
+            if(where.containsKey("fnotes")&&!StringUtils.isBlank(where.getString("fnotes"))){
+                pao.setValue("fnotes",where.getString("fnotes"),11l);
+            }
 
             hyconfirmationorder.save();
             return getReturnObject_suc().toString();

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

@@ -442,6 +442,8 @@ public class HyWorkOrder extends Controller {
 
                         /**Ìí¼ÓÎı¾**/
                         if(where.containsKey("ftext")){
+
+//                            System.out.println("where:"+where.getString("ftext"));
                             ordernodePao.setValue("ftext",where.getString("ftext"),11l);
                         }
                         /**Ìí¼ÓÈ·ÈÏ**/