|
|
@@ -1573,6 +1573,7 @@ public class Order extends Controller {
|
|
|
return getErrReturnObject().setErrMsg("订单不存在").toString();
|
|
|
}
|
|
|
Row row = rows.get(0);
|
|
|
+
|
|
|
if (dbConnect.runSqlQuery("SELECT 1 from sa_dispatch t1 left join sa_dispatch_items t2 on t1.sa_dispatchid=t2.sa_dispatchid and t1.siteid=t2.siteid left join sa_orderitems t3 on t2.sa_orderitemsid=t3.sa_orderitemsid and t2.siteid=t3.siteid WHERE t1.siteid='" + siteid + "' and t3.sa_orderid=" + sa_orderid).isNotEmpty()) {
|
|
|
return getErrReturnObject().setErrMsg("存在发货单,无法反审核").toString();
|
|
|
}
|
|
|
@@ -1750,6 +1751,9 @@ public class Order extends Controller {
|
|
|
if (rows.isEmpty()) {
|
|
|
return getErrReturnObject().setErrMsg("订单不存在").toString();
|
|
|
}
|
|
|
+ if (!rows.get(0).getString("status").equals("提交")) {
|
|
|
+ return getErrReturnObject().setErrMsg("订单非提交状态无法退回").toString();
|
|
|
+ }
|
|
|
//通过版本更新订单表头数据
|
|
|
beans.order.Order.updateOrderWithVersion(this);
|
|
|
Row row = rows.get(0);
|