订单提交bug修复

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

@@ -260,9 +260,14 @@ public class Order extends Controller {
         JSONArray items = content.getJSONArray("items");
         ArrayList<Long> itemidids = new ArrayList();
         ArrayList<Long> sa_shoppingcartids = new ArrayList();
+
+        OrderItemsHelper orderItemsHelper=new OrderItemsHelper(this);
         //判断是否是同一个品牌的商品
         for (Object obj : items) {
             JSONObject item = (JSONObject) obj;
+            orderItemsHelper.checkOffOrderItems("plm_item",item.getLongValue("itemid"));
+            orderItemsHelper.checkOffOrderItems("sa_promotion_items",item.getLongValue("itemid"));
+
             Long temp_sa_brandid = item.getLongValue("sa_brandid");
             itemidids.add(item.getLongValue("itemid"));
             sa_shoppingcartids.add(item.getLongValue("sa_shoppingcartid"));

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

@@ -53,6 +53,14 @@ public class OrderItemsHelper extends BaseClass {
         }
     }
 
+    public void checkOffOrderItems( String tablename,Long itemid) throws YosException {
+        Rows iteminfos = dbConnect.runSqlQuery("select t1.itemid from "+tablename+" t1  where t1.siteid='" + controller.siteid + "' and t1.isonsale!=1 and t1.itemid="+itemid);
+        if (iteminfos.isNotEmpty()) {
+            Row itemRow = dbConnect.runSqlQuery(0, "SELECT itemno from plm_item WHERE itemid=" + iteminfos.get(0).getString("itemid"));
+            new YosException(false, "检测到品号" + itemRow.getString("itemno") + "未上架，请删除后重试");
+        }
+    }
+
     /**
      * 是否符合商品起订量和增量判断
      *