总部端订单和发货单增加摘要

src/custom/restcontroller/sale/customer/Customer.java

@@ -480,17 +480,17 @@ public class Customer extends Controller {
                 where.append(")");
             }
 
-            where.append(getTableFilter("t3", "enterprisename", true));
-            where.append(getTableFilter("t1", "sa_customersid", true));
-            where.append(getTableFilter("t1", "type", false));
-            where.append(getTableFilter("t1", "customergrade", false));
-            where.append(getTableFilter("t3", "industry", true));
-            where.append(getTableFilter("t4", "enterprisename", "superiorenterprisename", true));
-            where.append(getTableFilter("t1", "tradingstatus", false));
-            where.append(getTableFilter("t3", "contact", true));
-            where.append(getTableFilter("t1", "status", false));
-            where.append(getTableFilter("t1", "source", true));
-            where.append(getTableFilter("t8", "poolname", "sourcepoolname", true));
+//            where.append(getTableFilter("t3", "enterprisename", true));
+//            where.append(getTableFilter("t1", "sa_customersid", true));
+//            where.append(getTableFilter("t1", "type", false));
+//            where.append(getTableFilter("t1", "customergrade", false));
+//            where.append(getTableFilter("t3", "industry", true));
+//            where.append(getTableFilter("t4", "enterprisename", "superiorenterprisename", true));
+//            where.append(getTableFilter("t1", "tradingstatus", false));
+//            where.append(getTableFilter("t3", "contact", true));
+//            where.append(getTableFilter("t1", "status", false));
+//            where.append(getTableFilter("t1", "source", true));
+//            where.append(getTableFilter("t8", "poolname", "sourcepoolname", true));
         }
         where.append(" and(");
         if (deleted == 1) {

src/custom/restcontroller/webmanage/sale/dispatch/SQL/发货商品列表查询.sql

@@ -15,7 +15,8 @@ SELECT t1.sa_orderitemsid,
        t3.createdate,
        t3.submitdate,
        t3.checkdate,
-       t3.remarks orderremarks
+       t3.remarks orderremarks,
+       t3.abstract
 FROM sa_orderitems t1
          inner join plm_item t2 on t1.siteid = t2.siteid and t1.itemid = t2.itemid
          inner join sa_order t3 on t1.siteid=t3.siteid and t1.sa_orderid=t3.sa_orderid

src/custom/restcontroller/webmanage/sale/dispatch/SQL/审核订单列表查询.sql

@@ -7,7 +7,8 @@ SELECT t1.sa_orderid,
        t2.enterprisename,
        t2.abbreviation,
        t1.checkdate,
-       t1.remarks
+       t1.remarks,
+       t1.abstract
 FROM sa_order t1
          LEFT JOIN sys_enterprise t2 ON t1.sys_enterpriseid = t2.sys_enterpriseid
     AND t1.siteid = t2.siteid

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

@@ -183,6 +183,7 @@ public class Order extends Controller {
         sqlFactory.addParameter("saletype", content.getStringValue("saletype"));
         sqlFactory.addParameter("signbackstatus", content.getStringValue("signbackstatus", true, "不需要"));
         sqlFactory.addParameter("projectnote", content.getStringValue("projectnote"));
+        sqlFactory.addParameter("abstract", content.getStringValue("abstract"));
 
         String sql = sqlFactory.getSQL();
 
@@ -303,6 +304,7 @@ public class Order extends Controller {
         sqlFactory.addParameter("saletype", content.getStringValue("saletype"));
         sqlFactory.addParameter("signbackstatus", content.getStringValue("signbackstatus", true, "不需要"));
         sqlFactory.addParameter("projectnote", content.getStringValue("projectnote"));
+        sqlFactory.addParameter("abstract", content.getStringValue("abstract"));
 
         dbConnect.runSqlUpdate(sqlFactory);
 
@@ -863,7 +865,7 @@ public class Order extends Controller {
     }
 
 
-    @API(title = "更新项目备注，备注，销售类别", apiversion = R.ID20230301152702.v1.class)
+    @API(title = "更新项目备注，备注，销售类别，摘要", apiversion = R.ID20230301152702.v1.class)
     public String update() throws YosException {
 
         Long sa_orderid = content.getLong("sa_orderid");
@@ -871,6 +873,7 @@ public class Order extends Controller {
         String remarks = content.getStringValue("remarks");
         String saletype = content.getStringValue("saletype");
 
+
         Rows orderRows = getOrderRows(this, sa_orderid);
         if (orderRows.get(0).getString("status").equals("关闭")) {
             return getErrReturnObject().setErrMsg("关闭状态无法修改").toString();
@@ -884,6 +887,7 @@ public class Order extends Controller {
         sqlFactory.addParameter("projectnote", projectnote);
         sqlFactory.addParameter("remarks", remarks);
         sqlFactory.addParameter("saletype", saletype);
+        sqlFactory.addParameter("abstract",  content.getStringValue("abstract"));
         dbConnect.runSqlUpdate(sqlFactory);
 
 

src/custom/restcontroller/webmanage/sale/order/SQL/更新订单项目备注等信息.sql

@@ -4,6 +4,7 @@ set changeuserid=$userid$,
     changedate = current_time,
     remarks = $remarks$,
     saletype = $saletype$,
-    projectnote=$projectnote$
+    projectnote=$projectnote$,
+    abstract=$abstract$
 where siteid = $siteid$
   and sa_orderid = $sa_orderid$

src/custom/restcontroller/webmanage/sale/order/SQL/订单(管理端)_列表.sql

@@ -9,6 +9,7 @@ SELECT t1.sa_orderid,
        t1.typemx,
        t1.tradefield,
        t1.`status`,
+       t1.abstract,
        t2.sys_enterpriseid,
        t2.enterprisename,
        t2.abbreviation,

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

@@ -7,6 +7,7 @@ SELECT t1.sa_orderid,
        t1.typemx,
        t1.tradefield,
        t1.`status`,
+       t1.abstract,
        t1.sa_promotionid,
        t2.sys_enterpriseid,
        t2.enterprisename,

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

@@ -2,10 +2,10 @@ insert into sa_order (sa_orderid, siteid, sonum, saler_hrid, type, typemx, sys_e
                       sa_brandid, sa_contractid, sa_projectid, sys_enterprise_financeid, rec_contactsid,
                       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)
+                      tradefieldmx, sa_promotionid, freightstatus, saletype, signbackstatus,projectnote,abstract)
 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$);
+        $sa_promotionid$, $freightstatus$, $saletype$, $signbackstatus$,$projectnote$,$abstract$);

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

@@ -19,6 +19,7 @@ set changeuserid=$userid$,
     freightstatus = $freightstatus$,
     saletype = $saletype$,
     signbackstatus = $signbackstatus$,
-    projectnote=$projectnote$
+    projectnote=$projectnote$,
+    abstract=$abstract$
 where siteid = $siteid$
   and sa_orderid = $sa_orderid$

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

@@ -10,6 +10,7 @@ SELECT t1.sa_orderid,
        t1.typemx,
        t1.tradefield,
        t1.`status`,
+       t1.abstract,
        t1.signbacknum,
        t1.sa_accountclassid,
        t1.sa_brandid,