商品同步bug修复及总部订单明细字段增加

src/custom/restcontroller/webmanage/lsak3/item/item.java

@@ -211,7 +211,6 @@ public class item extends Controller {
             sqlFactory.addParameter("unitgroupid","null");
 
             sqlFactory.addParameter("itemname", fitemname);
-            sqlFactory.addParameter("isonsale", 0);
             sqlFactory.addParameter("model", fmodel);
             sqlFactory.addParameter("spec", flong);
             // 订单起订量

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

@@ -878,18 +878,25 @@ public class OrderItems extends Controller {
     //查询订单列表(管理端)
     public QuerySQL queryAllListManage(String where) throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_orderitems",
-                "sa_orderitemsid", "itemid", "rowno", "itemno", "itemname", "unit", "qty", "undeliqty", "price", "amount", "remarks", "customproperties", "batchcontrol", "model",
+                "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");
         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");
         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");
+                "sonum", "type", "typemx", "status", "billdate", "submitdate", "checkdate", "tradefield","closedate","remarks");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t6.sys_enterpriseid = t5.sys_enterpriseid and t6.siteid = t5.siteid",
                 "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t7", "t7.sys_enterpriseid = t5.sys_enterpriseid and t7.siteid = t5.siteid",
                 "enterprisename");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_itemclass", "t8", "t8.itemclassid = t3.marketingcategory and t8.siteid = t3.siteid",
+                "itemclassname");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_tradefield", "t9", "t9.sys_enterpriseid = t5.sys_enterpriseid and t9.siteid = t5.siteid",
+                "sys_enterprise_tradefieldid");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_salearea", "t10", "t10.sa_saleareaid = t9.sa_saleareaid and t10.siteid = t9.siteid",
+                "areaname");
+        querySQL.addQueryFields("orderremarks", "t5.remarks");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
         querySQL.setWhere("t5.status in ('审核', '关闭','手工关闭')");