bug修复

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

@@ -130,6 +130,7 @@ public class aftersalesmag extends Controller {
         insertSQLdetail.setValue("machinecode", content.getStringValue("machinecode"));
         insertSQLdetail.setValue("qty", content.containsKey("qty") ? content.getIntValue("qty") : 1);
         insertSQLdetail.setValue("itemid", content.getLongValue("itemid"));
+        insertSQLdetail.setValue("remarks", content.getStringValue("remarksdetail"));
         sqlList.add(insertSQLdetail.getSQL());
 
         dbConnect.runSqlUpdate(sqlList);
@@ -381,6 +382,7 @@ public class aftersalesmag extends Controller {
         querySQL.setWhere(where.toString());
         querySQL.setWhere("t1.createflag=1 or t1.status !='新建'");
         querySQL.setPage(pageSize, pageNumber);
+        querySQL.setOrderBy("t1.sa_aftersalesmagid desc");
         Rows rows = querySQL.query();
 
 //        ArrayList<Long> ids = rows.toArrayList("sa_aftersalesmagid", new ArrayList<>());

src/custom/restcontroller/webmanage/sale/stock/Stock.java

@@ -29,7 +29,10 @@ public class Stock extends Controller {
         if (content.containsKey("where")) {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
-                where.append("and stockname like '%").append(whereObject.getString("condition")).append("%'");
+                where.append(" and(");
+                where.append("stockname like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or stockno like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
             }
         }
         SQLFactory sqlFactory = new SQLFactory(this, "仓库列表查询");