|
|
@@ -1823,6 +1823,10 @@ public class Order extends Controller {
|
|
|
String sonum = row.getString("sonum");
|
|
|
Long sys_enterpriseid = row.getLong("sys_enterpriseid");
|
|
|
|
|
|
+ if(StringUtils.isBlank(row.getString("sa_accountclassinfos"))){
|
|
|
+ dbConnect.runSqlUpdate(updateAccountclassinfos(sa_orderid,sa_accountclassid,sys_enterpriseid));
|
|
|
+ }
|
|
|
+
|
|
|
BigDecimal amount = beans.order.Order.getAmount(this, sa_orderid);
|
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
|
|
|
|
@@ -1907,6 +1911,10 @@ public class Order extends Controller {
|
|
|
Long sys_enterpriseid = row.getLong("sys_enterpriseid");
|
|
|
String sonum = row.getString("sonum");
|
|
|
|
|
|
+ if(StringUtils.isBlank(row.getString("sa_accountclassinfos"))){
|
|
|
+ dbConnect.runSqlUpdate(updateAccountclassinfos(sa_orderid,sa_accountclassid,sys_enterpriseid));
|
|
|
+ }
|
|
|
+
|
|
|
BigDecimal amount = beans.order.Order.getAmount(this, sa_orderid);
|
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
|
|
|
|
@@ -2977,6 +2985,7 @@ public class Order extends Controller {
|
|
|
public String closeOrder() throws YosException {
|
|
|
Long sa_orderid = content.getLong("sa_orderid");
|
|
|
|
|
|
+
|
|
|
//通过版本更新订单表头数据
|
|
|
beans.order.Order.updateOrderWithVersion(this);
|
|
|
|
|
|
@@ -2994,6 +3003,9 @@ public class Order extends Controller {
|
|
|
|
|
|
Long sys_enterpriseid = orderRow.get(0).getLong("sys_enterpriseid");
|
|
|
Long sa_accountclassid = orderRow.get(0).getLong("sa_accountclassid");
|
|
|
+ if(StringUtils.isBlank(orderRow.get(0).getString("sa_accountclassinfos"))){
|
|
|
+ dbConnect.runSqlUpdate(updateAccountclassinfos(sa_orderid,sa_accountclassid,sys_enterpriseid));
|
|
|
+ }
|
|
|
|
|
|
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.status not in ('关闭','手工关闭') and t1.siteid='" + siteid + "' and t3.sa_orderid=" + sa_orderid).isNotEmpty()) {
|
|
|
return getErrReturnObject().setErrMsg("存在未关闭的发货单,无法关闭").toString();
|