工单完结保修卡添加字段

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

@@ -314,6 +314,8 @@ public class expressform extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid",
                 "agentnum");
         querySQL.addJoinTable(JOINTYPE.inner, "sa_expressform_stockbill", "t4", "t1.st_stockbillid = t4.st_stockbillid AND t1.siteid = t4.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_department", "t5", "t5.departmentid = t1.departmentid AND t1.siteid = t5.siteid","depname");
+
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t1.type='销售出库' and t4.expressformid='" + expressformid + "'");
         querySQL.setWhere(where);

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

@@ -384,9 +384,7 @@ public class stockbill extends Controller {
         if (billtypes.contains("返修出库")) {
             querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair", "t10", "t10.sourceid=t1.st_stockbillid and t10.siteid = t1.siteid and t10.sourcetable='st_stockbill'","instockdate");
         }
-        if(billtypes.contains("返修入库")){
-            //querySQL.addJoinTable(JOINTYPE.left, "(SELECT st_stockbillid,itemno,itemname,model,sku,siteid FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY st_stockbillid ORDER BY st_stockbill_itemsid ASC) AS szrowno FROM st_stockbill_items) t WHERE szrowno = 1)", "t11", "t1.st_stockbillid=t11.st_stockbillid and t1.siteid = t11.siteid","itemno","itemname","model","sku");
-        }
+
 
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t1.type", billtypes);
@@ -418,6 +416,37 @@ public class stockbill extends Controller {
             }
         }
 
+        if(billtypes.contains("返修入库")){
+            //querySQL.addJoinTable(JOINTYPE.left, "(SELECT st_stockbillid,itemno,itemname,model,sku,siteid FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY st_stockbillid ORDER BY st_stockbill_itemsid ASC) AS szrowno FROM st_stockbill_items) t WHERE szrowno = 1)", "t11", "t1.st_stockbillid=t11.st_stockbillid and t1.siteid = t11.siteid","itemno","itemname","model","sku");
+            QuerySQL querySQLDatail = SQLFactory.createQuerySQL(this, "st_stockbill_items","itemname","model","sku", "st_stockbillid").setTableAlias("t1");
+            querySQLDatail.setWhere("t1.st_stockbillid",ids);
+            Rows rowsdatail = querySQLDatail.query();
+            RowsMap rowsdatailMap = rowsdatail.toRowsMap("st_stockbillid");
+            for(Row row :rows){
+                if(rowsdatailMap.containsKey(row.getString("st_stockbillid"))){
+                    row.put("stockbillitems",rowsdatailMap.get(row.getString("st_stockbillid")));
+                }
+            }
+
+        }
+        if(billtypes.contains("销售出库")){
+            //querySQL.addJoinTable(JOINTYPE.left, "(SELECT st_stockbillid,itemno,itemname,model,sku,siteid FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY st_stockbillid ORDER BY st_stockbill_itemsid ASC) AS szrowno FROM st_stockbill_items) t WHERE szrowno = 1)", "t11", "t1.st_stockbillid=t11.st_stockbillid and t1.siteid = t11.siteid","itemno","itemname","model","sku");
+            QuerySQL expressformQuery = SQLFactory.createQuerySQL(this, "expressform", "*").setTableAlias("t1");
+            expressformQuery.addJoinTable(JOINTYPE.inner, "sa_expressform_stockbill", "t2", "t2.expressformid = t1.expressformid");
+            expressformQuery.addJoinTable(JOINTYPE.inner, "st_stockbill", "t3", "t3.st_stockbillid = t2.st_stockbillid","tracknumber","st_stockbillid");
+            expressformQuery.setWhere("t3.st_stockbillid", ids);
+            expressformQuery.setOrderBy("t1.createdate asc");
+            expressformQuery.setDistinct(true);
+            Rows expressformrows = expressformQuery.query();
+            RowsMap expressformrowsMap = expressformrows.toRowsMap("st_stockbillid");
+            for(Row row :rows){
+                if(expressformrowsMap.containsKey(row.getString("st_stockbillid"))){
+                    row.put("expressform",expressformrowsMap.get(row.getString("st_stockbillid")));
+                }
+            }
+
+        }
+
 
 
         return getSucReturnObject().setData(rows).toString();

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

@@ -1063,7 +1063,7 @@ public class workorder extends Controller {
         }
 
         if (rows.get(0).getString("type").equals("安装")) {
-            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.sa_customersid,t5.sa_agentsid customeragentsid,t5.name,t5.phonenumber,t3.province,t3.city,t3.county,t5.address,t5.sex,t1.sku,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 " +
+            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.sa_customersid,t5.sa_agentsid customeragentsid,t5.name,t5.phonenumber,t3.province,t3.city,t3.county,t5.address,t1.sku,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 " +
                     " inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid " +
                     " left join sa_serviceorder t3 on t1.sa_serviceorderid=t3.sa_serviceorderid and t1.siteid=t3.siteid " +
                     " left join sa_agents t4 on t3.sys_enterpriseid=t4.sys_enterpriseid and t3.siteid=t4.siteid " +
@@ -1102,7 +1102,6 @@ public class workorder extends Controller {
                     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("sex", itemrows.get(0).getString("sex"));
                     insertSQL.setValue("sa_customersid", sa_customersid);
                     insertSQL.setValue("itemid", itemrows.get(0).getLong("itemid"));
                     sqlList.add(insertSQL.getSQL());