|
@@ -1097,11 +1097,15 @@ public class Order extends Controller {
|
|
|
return getErrReturnObject().setErrMsg("存在商品数量为零,无法提交").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();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
// String type = row.getString("type");
|
|
|
//提交
|
|
|
String status = "提交";
|
|
@@ -1129,7 +1133,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 sa_promotion_itemsid,itemno,sum(qty) qty from sa_orderitems where siteid='" + siteid + "' and sa_orderid=" + sa_orderid +" group by sa_promotion_itemsid,itemno");
|
|
|
Rows promotionitems = dbConnect.runSqlQuery("select * from sa_promotion_items where siteid='" + siteid + "' and sa_promotionid=" + row.getLong("sa_promotionid"));
|