代码整理

pom.xml

@@ -92,7 +92,7 @@
         <dependency>
             <groupId>com.yunlian.yos</groupId>
             <artifactId>yos-core</artifactId>
-            <version>3.2.23</version>
+            <version>3.2.24</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>

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

@@ -1001,13 +1001,6 @@ public class OrderItems extends Controller {
         }
 
         boolean isExport = content.getBooleanValue("isExport");
-//        SQLFactory sqlFactory = new SQLFactory(this, "订单商品明细_所有列表", pageSize, pageNumber, pageSorting);
-//        if (isExport) {
-//            sqlFactory = new SQLFactory(this, "订单商品明细_所有列表");
-//        }
-//        sqlFactory.addParameter("siteid", siteid);
-//        sqlFactory.addParameter_SQL("where", where);
-//        Rows rows = dbConnect.runSqlQuery(sqlFactory);
         QuerySQL querySQL = queryAllListManage(where.toString());
         querySQL.setOrderBy(pageSorting);
         querySQL.setPage(pageSize, pageNumber);
@@ -1071,74 +1064,12 @@ public class OrderItems extends Controller {
                 row.put("outwarehouseqty",0);
             }
         }
-
-//        if (isExport) {
-//            //去除不需要导出项
-//            rows.getFieldList().remove("sa_orderitemsid");
-//            rows.getFieldList().remove("itemid");
-//            rows.getFieldList().remove("batchcontrol");
-//            rows.getFieldList().remove("model");
-//            rows.getFieldList().remove("conversionrate");
-//            rows.getFieldList().remove("marketprice");
-//            rows.getFieldList().remove("defaultprice");
-//            rows.getFieldList().remove("defaultamount");
-//            rows.getFieldList().remove("auxqty");
-//            rows.getFieldList().remove("needdate");
-//            rows.getFieldList().remove("deliedqty");
-//            rows.getFieldList().remove("rebateamount");
-//            rows.getFieldList().remove("invoiceamount");
-//            rows.getFieldList().remove("writeoffamount");
-//            rows.getFieldList().remove("auxunit");
-//            rows.getFieldList().remove("sa_orderid");
-//            rows.getFieldList().remove("deliverydate");
-//            rows.getFieldList().remove("returnqty");
-//            rows.getFieldList().remove("stockno");
-//            rows.getFieldList().remove("position");
-//            rows.getFieldList().remove("batchno");
-//            rows.getFieldList().remove("isfreeze");
-//            rows.getFieldList().remove("candispatchqty");
-//            rows.getFieldList().remove("cansaleqty");
-//            rows.getFieldList().remove("totalaty");
-//            rows.getFieldList().remove("orderminqty_auxunit");
-//            rows.getFieldList().remove("orderminqty");
-//            rows.getFieldList().remove("orderaddqty_auxunit");
-//            rows.getFieldList().remove("orderaddqty");
-//            rows.getFieldList().remove("spec");
-//            rows.getFieldList().remove("packageqty");
-//            rows.getFieldList().remove("delivery");
-//            rows.getFieldList().remove("erpitemno");
-//            rows.getFieldList().remove("erpitemname");
-//            rows.getFieldList().remove("prodline");
-//            rows.getFieldList().remove("material");
-//            rows.getFieldList().remove("device");
-//            rows.getFieldList().remove("specalnote");
-//            rows.getFieldList().remove("standards");
-//            rows.getFieldList().remove("agentnum");
-//            rows.getFieldList().remove("enterprisename");
-//            rows.getFieldList().remove("agentnum");
-//            rows.getFieldList().remove("stockstatus");
-//            rows.getFieldList().remove("submitdate");
-//            rows.getFieldList().remove("checkdate");
-//            Rows rowsrolename = dbConnect.runSqlQuery("select * from sys_userrole t1 inner join sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t2.rolename='经销商员工' and t1.userid=" + userid);
-//            if (!rowsrolename.isEmpty()) {
-//                rows.getFieldList().remove("price");
-//                rows.getFieldList().remove("amount");
-//            }
-//
-//            Rows uploadRows = uploadExcelToObs("orderdetail", "订单明细列表", rows, getTitleMapAgent());
-//            return getSucReturnObject().setData(uploadRows).toString();
-//        }
-
-
         return getSucReturnObject().setData(rows).toString();
     }
 
     //查询订单列表(管理端)
     public QuerySQL queryAllListManage(String where) throws YosException {
 
-
-
-
         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",