发货方式显示错误

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

@@ -365,10 +365,10 @@ public class accessoryorder extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_orderitems",
                 "sa_orderitemsid", "itemid", "rowno", "itemno", "itemname", "unit", "qty", "undeliqty", "saleprice", "defaultprice", "price", "amount", "remarks", "customproperties", "batchcontrol", "model",
                 "conversionrate", "marketprice", "defaultprice", "defaultamount", "auxqty", "needdate", "deliedqty", "rebateamount", "invoiceamount", "writeoffamount", "auxunit", "sa_orderid",
-                "deliverydate", "returnqty", "stockno", "position", "batchno", "isfreeze", "decorationrebateflag");
+                "deliverydate", "returnqty", "stockno", "position", "batchno", "isfreeze", "decorationrebateflag","delivery");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t3.itemid = t1.itemid and t3.siteid = t1.siteid",
-                "orderminqty_auxunit", "orderminqty", "orderaddqty_auxunit", "orderaddqty", "spec", "standards", "packageqty", "delivery", "k3outcode");
+                "orderminqty_auxunit", "orderminqty", "orderaddqty_auxunit", "orderaddqty", "spec", "standards", "packageqty", "k3outcode");
         querySQL.addJoinTable(JOINTYPE.left, "sa_order", "t5", "t5.sa_orderid = t1.sa_orderid and t5.siteid = t1.siteid",
                 "sonum", "type", "typemx", "status", "billdate", "submitdate", "checkdate", "tradefield", "closedate");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t6.sys_enterpriseid = t5.sys_enterpriseid and t6.siteid = t5.siteid",

src/custom/restcontroller/webmanage/sale/u8/SQL/销售出库U8上传单据查询.sql

@@ -2,7 +2,7 @@ select t1.address,t1.sys_enterpriseid,t1.billno,t1.name,t1.billdate,t1.remarks,t
        case when t1.typemx='正品入库'then'红'else rb end rb,t1.sourceid,t1.sourceobject,t1.st_stockbillid,t2.u8id,t1.status,t1.type,t1.typemx,t1.outplace  from st_stockbill t1
                                                                                                                                                                  inner join (
     select distinct st_stockbillid,inserted.u8id,inserted.entity from u8billcodes
-        inner join u8 inserted on u8billcodes.u8id=inserted.u8id where inserted.u8id=$u8id$ and st_stockbillid=4876674
+        inner join u8 inserted on u8billcodes.u8id=inserted.u8id where inserted.u8id=$u8id$
 ) t2 on t1.st_stockbillid=t2.st_stockbillid
                                                                                                                                                                  inner join sa_agents t3 on t1.sys_enterpriseid=t3.sys_enterpriseid and t2.entity=t3.entity
 		

src/custom/restcontroller/webmanage/sale/u8/SQL/销售出库U8上传序列号查询.sql

@@ -156,6 +156,6 @@ WHERE t4.type = '电商'
   AND t5.topclassnum = '集成灶'
     )
 -- 最终结果
-SELECT * FROM main_query where st_stockbillid=4876674
+SELECT * FROM main_query
 UNION ALL
-SELECT * FROM ecommerce_query where st_stockbillid=4876674;
+SELECT * FROM ecommerce_query