订单工单新增字段及核销申请金额不显示bug修复

src/custom/restcontroller/sale/order/Order.java

@@ -110,7 +110,7 @@ public class Order extends Controller {
     //查询订单列表(经销商)
     public QuerySQL queryList(String where) throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_order",
-                "sa_orderid", "sonum", "status", "type", "billdate", "tradefield", "remarks","rec_contactsid");
+                "sa_orderid", "sonum", "status", "type", "billdate", "tradefield", "remarks","rec_contactsid","checkdate","closedate");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sa_brand", "t3", "t3.sa_brandid = t1.sa_brandid",
                 "brandname");

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -289,6 +289,7 @@ public class Order extends Controller {
         sqlFactory.addParameter("delivery", StringUtils.isBlank(agentRows.get(0).getString("delivery"))?content.getStringValue("delivery"):agentRows.get(0).getString("delivery"));
         sqlFactory.addParameter("tracknumber", content.getStringValue("tracknumber"));
         sqlFactory.addParameter("mailno", content.getStringValue("mailno"));
+        sqlFactory.addParameter("submitphonenumber", content.getStringValue("submitphonenumber"));
 
         String sql = sqlFactory.getSQL();
 
@@ -512,7 +513,8 @@ public class Order extends Controller {
 
         sqlFactory.addParameter("delivery", StringUtils.isBlank(agentRows.get(0).getString("delivery"))?content.getStringValue("delivery"):agentRows.get(0).getString("delivery"));
         sqlFactory.addParameter("tracknumber", content.getStringValue("tracknumber"));
-
+        sqlFactory.addParameter("mailno", content.getStringValue("mailno"));
+        sqlFactory.addParameter("submitphonenumber", content.getStringValue("submitphonenumber"));
         dbConnect.runSqlUpdate(sqlFactory);
 
         content.put("sa_orderid", sa_orderid);

src/custom/restcontroller/webmanage/sale/order/SQL/订单_列表.sql

@@ -11,6 +11,7 @@ SELECT t1.sa_orderid,
        t1.delivery,
        t1.tracknumber,
        t1.mailno,
+       t1.submitphonenumber,
        t1.sa_promotionid,
        t2.sys_enterpriseid,
        t2.enterprisename,

src/custom/restcontroller/webmanage/sale/order/SQL/订单_新增.sql

@@ -3,11 +3,11 @@ insert into sa_order (sa_orderid, siteid, sonum, saler_hrid, type, typemx, sys_e
                       remarks, status, createuserid, createby, createdate, changeuserid, changeby, changedate,
                       createflag, tradefield, pay_enterpriseid, billdate, rebate_used, rebate_userate, signbacknum,
                       tradefieldmx, sa_promotionid, freightstatus, saletype, signbackstatus,projectnote,abstract,delivery,
-                      tracknumber,mailno,invoicetaxno,invoicename,invoiceaddress,contact,address,phonenumber,province,city,county)
+                      tracknumber,mailno,invoicetaxno,invoicename,invoiceaddress,contact,address,phonenumber,province,city,county,submitphonenumber)
 values ($sa_orderid$, $siteid$, $sonum$, $saler_hrid$, $type$, $typemx$, $sys_enterpriseid$, $sa_accountclassid$,
         $sa_brandid$, $sa_contractid$, $sa_projectid$, $sys_enterprise_financeid$, $rec_contactsid$,
         $remarks$, '新建', $userid$, $username$, current_time, $userid$, $username$, current_time, $createflag$,
         $tradefield$, $pay_enterpriseid$, $billdate$, $rebate_used$,
         (SELECT order_rebate_userate from sys_site_parameter WHERE siteid = $siteid$), $signbacknum$, $tradefieldmx$,
         $sa_promotionid$, $freightstatus$, $saletype$, $signbackstatus$,$projectnote$,$abstract$,$delivery$,
-        $tracknumber$,$mailno$,$invoicetaxno$,$invoicename$,$invoiceaddress$,$contact$,$address$,$phonenumber$,$province$,$city$,$county$);
+        $tracknumber$,$mailno$,$invoicetaxno$,$invoicename$,$invoiceaddress$,$contact$,$address$,$phonenumber$,$province$,$city$,$county$,$submitphonenumber$);

src/custom/restcontroller/webmanage/sale/order/SQL/订单_更新.sql

@@ -32,6 +32,7 @@ set changeuserid=$userid$,
     phonenumber=$phonenumber$,
     province=$province$,
     city=$city$,
-    county=$county$
+    county=$county$,
+    submitphonenumber=$submitphonenumber$
 where siteid = $siteid$
   and sa_orderid = $sa_orderid$

src/custom/restcontroller/webmanage/sale/order/SQL/订单_详情.sql

@@ -40,6 +40,7 @@ SELECT t1.sa_orderid,
        t1.sa_contractid,
        t1.sa_promotionid,
        t1.freightstatus,
+       t1.submitphonenumber,
        t2.sys_enterpriseid,
        t2.enterprisename,
        t2.abbreviation,

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

@@ -120,7 +120,7 @@ public class tpartreimbursement extends Controller {
         querySQLdetail.setWhere("t1.siteid", siteid);
         querySQLdetail.setWhere("t1.sa_tpartreimbursementid", rows.toArrayList("sa_tpartreimbursementid"));
         querySQLdetail.addQueryFields("amount","ROUND(t2.price*t1.qty)");
-        Rows rowsdetail = querySQL.query();
+        Rows rowsdetail = querySQLdetail.query();
         RowsMap rowsMap = rowsdetail.toRowsMap("sa_tpartreimbursementid");
         for (Row row : rows) {
             row.put("totalamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).sum("amount"));

src/custom/restcontroller/webmanage/sale/workorder/SQL/服务工单更新.sql

@@ -13,7 +13,8 @@ SET
     scenecontactphonenumber = $scenecontactphonenumber$,
     isouritem = $isouritem$,
     remarks = $remarks$,
-    type=$type$
+    type=$type$,
+    servicemileage=$servicemileage$
 WHERE sa_workorderid = $sa_workorderid$ and siteid=$siteid$
 
 

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

@@ -73,6 +73,7 @@ public class workorder extends Controller {
         String name = content.getStringValue("name");
         String phonenumber = content.getStringValue("phonenumber");
         long sa_customersid = content.getLongValue("sa_customersid");
+        String servicemileage = content.getStringValue("servicemileage");
 
         long itemid = content.getLongValue("itemid");
 
@@ -118,6 +119,8 @@ public class workorder extends Controller {
         sqlFactory.addParameter("scenecontactphonenumber", scenecontactphonenumber);
         sqlFactory.addParameter("isouritem", isouritem);
         sqlFactory.addParameter("remarks", remarks);
+        sqlFactory.addParameter("servicemileage", servicemileage);
+
 
         sqlList.add(sqlFactory.getSQL());