生成保修卡经销商修改

src/custom/restcontroller/webmanage/sale/workorder/workorder.java

@@ -1200,7 +1200,7 @@ public class workorder extends Controller {
         }
 
         if (rows.get(0).getString("type").equals("安装")) {
-            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.scenecontact,t3.scenecontactphonenumber,t3.sa_customersid,t5.sa_agentsid customeragentsid," +
+            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.scenecontact,t3.scenecontactphonenumber,t3.sa_customersid,t7.sys_enterpriseid skuenterpriseid,t7.sa_agentsid skuagentsid," +
                     "case when t3.sa_customersid!=0 then t5.name else t3.name end name,case when t3.sa_customersid!=0 then t5.phonenumber else t3.phonenumber end phonenumber," +
                     "t3.province,t3.city,t3.county, case when t3.sa_customersid!=0 then t5.address else t3.address end address,ifnull(t2.warrantyday,0) warrantyday,t4.sa_agentsid,t3.sys_enterpriseid,t6.sa_agentsid sa_agentsid_to,t6.agentnum toagentnum,t7.itemid from sa_serviceorderitems t1  \n" +
                     "                     inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  \n" +
@@ -1217,32 +1217,13 @@ public class workorder extends Controller {
                 long sa_customersid = 0;
                 //判断客户id对应的经销商id
                 long customeragentsid = 0;
-                if (itemrows.get(0).getLong("sa_customersid") != 0) {
-                    sa_customersid = itemrows.get(0).getLong("sa_customersid");
-                    customeragentsid = itemrows.get(0).getLong("customeragentsid");
-                }else {
-//                     return getErrReturnObject().setErrMsg("客户不存在").toString();
-//                    InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sa_customers");
-//                    sa_customersid = createTableID("sa_customers");
-//                    insertSQL.setUniqueid(sa_customersid);
-//                    insertSQL.setSiteid(siteid);
-//                    if (itemrows.get(0).getLong("sa_agentsid") == 0) {
-//                        insertSQL.setValue("sa_agentsid", itemrows.get(0).getLong("sa_agentsid_to"));
-//                        customeragentsid = itemrows.get(0).getLong("sa_agentsid_to");
-//                    } else {
-//                        insertSQL.setValue("sa_agentsid", itemrows.get(0).getLong("sa_agentsid"));
-//                        customeragentsid = itemrows.get(0).getLong("sa_agentsid");
-//                    }
-//                    insertSQL.setValue("sa_agentsid_to", itemrows.get(0).getLong("sa_agentsid_to"));
-//                    insertSQL.setValue("name", itemrows.get(0).getString("name"));
-//                    insertSQL.setValue("phonenumber", itemrows.get(0).getString("phonenumber"));
-//                    insertSQL.setValue("province", itemrows.get(0).getString("province"));
-//                    insertSQL.setValue("city", itemrows.get(0).getString("city"));
-//                    insertSQL.setValue("county", itemrows.get(0).getString("county"));
-//                    insertSQL.setValue("address", itemrows.get(0).getString("address"));
-//                    insertSQL.setValue("sa_customersid", sa_customersid);
-//                    insertSQL.setValue("itemid", itemrows.get(0).getLong("itemid"));
-//                    sqlList.add(insertSQL.getSQL());
+                sa_customersid = itemrows.get(0).getLong("sa_customersid");
+                customeragentsid = itemrows.get(0).getLong("skuagentsid");
+                if(customeragentsid==0){
+                    Rows agentsrows = dbConnect.runSqlQuery("select sa_agentsid from sa_agents where sys_enterpriseid="+itemrows.get(0).getLong("skuenterpriseid"));
+                    if(agentsrows.isNotEmpty()){
+                        customeragentsid=agentsrows.get(0).getLong("sa_agentsid");
+                    }
                 }
 
                 LocalDate now = LocalDate.now();
@@ -1259,13 +1240,8 @@ public class workorder extends Controller {
                 InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sa_warrantycard");
                 insertSQL.setUniqueid(createTableID("sa_warrantycard"));
                 insertSQL.setSiteid(siteid);
-                if(sa_customersid!=0){
-                    insertSQL.setValue("sa_agentsid", customeragentsid);
-                    insertSQL.setValue("toagentnum", itemrows.get(0).getString("toagentnum"));
-                }else{
-                    insertSQL.setValue("sa_agentsid", itemrows.get(0).getString("sa_agentsid_to"));
-                    insertSQL.setValue("toagentnum", itemrows.get(0).getString("toagentnum"));
-                }
+                insertSQL.setValue("sa_agentsid", customeragentsid);
+                insertSQL.setValue("toagentnum", itemrows.get(0).getString("toagentnum"));
 
                 insertSQL.setValue("sku", itemrows.get(0).getString("sku"));
                 insertSQL.setValue("cardno", createBillCode("warrantycard"));