shenjingwei vor 2 Monaten
Ursprung
Commit
46e054018e

+ 1 - 1
src/custom/restcontroller/webmanage/sale/serviceorder/serviceorder.java

@@ -78,7 +78,7 @@ public class serviceorder extends Controller {
                 if (StringUtils.isBlank(sku)) {
                     //return getErrReturnObject().setErrMsg("安装服务单需添加序列号").toString();
                 }
-                if (dbConnect.runSqlQuery("select * from sa_warrantycard where sku='" + sku + "' and siteid='" + siteid + "'").isNotEmpty()) {
+                if (!sku.isBlank() && dbConnect.runSqlQuery("select * from sa_warrantycard where sku='" + sku + "' and siteid='" + siteid + "'").isNotEmpty()) {
                     DataTag.createSystemTag(this, "sa_serviceorder", sa_serviceorderid, "重复安装");
                     //return getErrReturnObject().setErrMsg("该序列号已安装,无法再次安装").toString();
                 }

+ 6 - 6
src/custom/restcontroller/webmanage/sale/workorder/workorderTemplate.java

@@ -127,12 +127,12 @@ public class workorderTemplate extends Controller {
             if (isused) {
                 sqlList.add("update sa_workorder_template set isused=1 where sa_workorder_templateid=" + sa_workorder_templateid);
             } else {
-                Rows workorderRows = dbConnect
-                        .runSqlQuery("select sa_workorderid from sa_workorder where siteid='" + siteid
-                                + "' and sa_workorder_templateid='" + sa_workorder_templateid + "'");
-                if (!workorderRows.isEmpty()) {
-                    //return getErrReturnObject().setErrMsg("该服务工单模板已被使用,无法停用").toString();
-                }
+//                Rows workorderRows = dbConnect
+//                        .runSqlQuery("select sa_workorderid from sa_workorder where siteid='" + siteid
+//                                + "' and sa_workorder_templateid='" + sa_workorder_templateid + "'");
+//                if (!workorderRows.isEmpty()) {
+//                    //return getErrReturnObject().setErrMsg("该服务工单模板已被使用,无法停用").toString();
+//                }
                 sqlList.add("update sa_workorder_template set isused=0 where sa_workorder_templateid=" + sa_workorder_templateid);
             }
         } else {