班管家 2021-12-29 10:15

src/apps/ordernode/ordernode.java

@@ -84,7 +84,10 @@ public class ordernode extends PaoCust {
 
         }
         String s = fisPreComplate();
-        if(!s.equals("true"))return "存在"+s+"工序没有确认";
+        if(!s.equals("true")){
+            if(getOwner()!=null&&!getOwner().getString("ftype").equals("维修"))
+                return "存在"+s+"工序没有确认";
+        }
         //是否上传附件
         if(getBoolean("fisupload")){
             PaoSetRemote doclinks =null;

src/rest/openapi/restcontroller/hyworkorder/webapp/hyconfirmationorder/SQL/售后服务确认单详情.sql

@@ -1,5 +1,5 @@
 select t.fbillnum,t.fstatus,t1.fisperiod,t1.repairprice,t1.scenefname,t1.scenephone,t2.appsystem,t2.errcategory,t.problemmsg,t.treatmentmeasures,
-       CONVERT(varchar,t.nexthandledate,120)nexthandledate,t.Itemdescription,t.result,t.result_msg,t.fnotes,t.nextreturndate,t.reactionrate,t.Cooperativeattitude,
+       CONVERT(varchar,t.nexthandledate,120)nexthandledate,t.itemdescription,t.result,t.result_msg,t.fnotes,t.nextreturndate,t.reactionrate,t.coperativeattitude,
        t.hyconfirmationorid ownerid,t2.afterserviceordeid,convert(varchar,t.createdate,120)createdate,case when t3.ftype='ÏîÄ¿¶©µ¥' then t4.FPROJECTNAME else t3.FPROJECTNOTES end fprojectname,
        t1.faddress
 from hyconfirmationorder t

src/rest/openapi/restcontroller/hyworkorder/webapp/titem/titem.java

@@ -8,7 +8,7 @@ import openapi.base.data.db.DBConnect;
 import org.apache.commons.lang.StringUtils;
 
 public class titem extends Controller {
- 
+
     public titem(JSONObject content) {
         super(content);
     }
@@ -35,7 +35,7 @@ public class titem extends Controller {
                         "or t.fmodel like '%"+where.getString("fitemname")+"%' "+
                         "or t.fspec like '%"+where.getString("fitemname")+"%' )";
             }
-            
+
             factory.addParameter_SQL("where",wherestr);
             System.out.println(factory.getSQL());
             Rows rows = dbConnect.runSqlQuery(factory.getSQL());