报错修复及增加字段

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

@@ -458,6 +458,16 @@ public class accessoryorder extends Controller {
                 where.append("t1.sku ='").append(whereObject.getString("sku")).append("' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("mame") && !"".equals(whereObject.getString("mame"))) {
+                where.append(" and(");
+                where.append("t1.mame ='").append(whereObject.getString("mame")).append("' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("phonenumber") && !"".equals(whereObject.getString("phonenumber"))) {
+                where.append(" and(");
+                where.append("t1.phonenumber ='").append(whereObject.getString("phonenumber")).append("' ");
+                where.append(")");
+            }
         }
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_warrantycard", "*");
         querySQL.addJoinTable(JOINTYPE.inner, "sa_agents", "t2", "t1.sa_agentsid = t2.sa_agentsid AND t1.siteid = t2.siteid");

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

@@ -637,7 +637,7 @@ public class OrderItems extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_orderitems", "*");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "st_invbal_sale", "t2", "t2.siteid = t1.siteid AND t2.itemid = t1.itemid", "cansaleqty", "candispatchqty");
-        querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t3.itemid = t1.itemid and t3.siteid = t1.siteid", "orderminqty_auxunit", "orderaddqty_auxunit", "spec", "iscustomsize", "widthschemeid", "lengthschemeid", "standards", "k3outcode","outplace");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t3.itemid = t1.itemid and t3.siteid = t1.siteid", "orderminqty_auxunit", "orderaddqty_auxunit", "spec", "iscustomsize", "widthschemeid", "lengthschemeid", "standards", "k3outcode","outplace","aftersalesitemno");
         if (sa_promotionid > 0) {
             querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_items", "t4", "t4.sa_promotion_itemsid = t1.sa_promotion_itemsid and t4.siteid = t1.siteid and t4.sa_promotionid=" + sa_promotionid, "packagetypemx", "saledqty", "groupqty");
         }
@@ -673,6 +673,8 @@ public class OrderItems extends Controller {
             querySQL.addQueryFields("machineitemname", "t7.itemname");
             querySQL.addQueryFields("machinemodel", "t7.model");
             querySQL.addQueryFields("machinespec", "t7.spec");
+            querySQL.addQueryFields("warrantystatus", "CASE WHEN ifnull(t6.enddate,'')='' then '' else CASE WHEN t6.enddate >= CURDATE() THEN '保内' ELSE '保外' END end");
+
         }
 
         querySQL.setCondition("t1.itemno", "t1.itemname", "t1.model", "t3.spec", "t1.remarks");
@@ -752,6 +754,7 @@ public class OrderItems extends Controller {
             } else {
                 row.put("cover", "");
             }
+
         }
         return getSucReturnObject().setData(rows).toString();
     }

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

@@ -217,8 +217,8 @@ public class stockbill extends Controller {
                 batchDeleteErr.addErr(st_stockbillid, "该单据不存在");
                 continue;
             }
-            sqlList.add(DataContrlLog.createLog(this, "st_stockbill", st_stockbillid, "更新", "单据日期【"+billdate+"】调整成功").getSQL());
-            sqlList.add("update st_stockbill set billdate='"+billdate+"',period='"+period+"' where st_stockbillid="+st_stockbillid);
+            sqlList.add(DataContrlLog.createLog(this, "st_stockbill", st_stockbillid, "更新", "单据日期【"+content.getString("billdate")+"】调整成功").getSQL());
+            sqlList.add("update st_stockbill set billdate='"+content.getString("billdate")+"',period='"+period+"' where st_stockbillid="+st_stockbillid);
         }
         dbConnect.runSqlUpdate(sqlList);
         return batchDeleteErr.getReturnObject().toString();