订单提交增加商品上架判断

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

@@ -1233,9 +1233,12 @@ public class Order extends Controller {
         if (orderitems.isNotEmpty()) {
             return getErrReturnObject().setErrMsg("订单表体行号为【" + orderitems.get(0).getLong("rowno") + "】的商品数量为0无法提交").toString();
         }
-        Rows iteminfos = dbConnect.runSqlQuery("select t2.itemno from sa_orderitems t1 inner join plm_item t2 on t1.siteid=t2.siteid and t1.itemid=t2.itemid where t1.sa_orderid=" + sa_orderid + " and t1.siteid='" + siteid + "' and t2.isonsale!=1");
-        if (iteminfos.isNotEmpty()) {
-            return getErrReturnObject().setErrMsg("检测到品号"+iteminfos.get(0).getLong("itemno") + "未上架，请删除后重试").toString();
+        String type = row.getString("type");
+        if (!type.equals("促销订单")) {
+            Rows iteminfos = dbConnect.runSqlQuery("select t2.itemno from sa_orderitems t1 inner join plm_item t2 on t1.siteid=t2.siteid and t1.itemid=t2.itemid where t1.sa_orderid=" + sa_orderid + " and t1.siteid='" + siteid + "' and t2.isonsale!=1");
+            if (iteminfos.isNotEmpty()) {
+                return getErrReturnObject().setErrMsg("检测到品号"+iteminfos.get(0).getLong("itemno") + "未上架，请删除后重试").toString();
+            }
         }
 
         //通过版本更新订单表头数据
@@ -1268,7 +1271,6 @@ public class Order extends Controller {
         }
         ArrayList<String> sqlList = new ArrayList<>();
         String sonum = row.getString("sonum");
-        String type = row.getString("type");
         if (type.equals("促销订单")) {
             Rows orderdetails = dbConnect.runSqlQuery("select * from sa_orderitems where siteid='" + siteid + "' and sa_orderid=" + sa_orderid);
             Rows promotionitems = dbConnect.runSqlQuery("select * from sa_promotion_items where siteid='" + siteid + "' and sa_promotionid=" + row.getLong("sa_promotionid"));