Merge remote-tracking branch 'origin/develop' into develop-test

src/custom/beans/order/Order.java

@@ -261,7 +261,7 @@ public class Order extends BaseClass {
      * @throws YosException
      */
     public static Rows getOrderRows(Controller controller, Long sa_orderid) throws YosException {
-        return controller.dbConnect.runSqlQuery("SELECT * from sa_order WHERE sa_orderid = " + sa_orderid + " and siteid = '" + controller.siteid + "'");
+        return controller.dbConnect.runSqlQuery("SELECT * from sa_order WHERE deleted=0 and sa_orderid = " + sa_orderid + " and siteid = '" + controller.siteid + "'");
 
     }
 

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

@@ -2556,6 +2556,9 @@ public class Order extends Controller {
         if (StringUtils.isBlank(row.getString("contact"))) {
             return getErrReturnObject().setErrMsg("请补充收货信息").toString();
         }
+        if(row.getBoolean("deleted")){
+            return getErrReturnObject().setErrMsg("订单已被删除！").toString();
+        }
 
 
         String type = row.getString("type");
@@ -3193,7 +3196,9 @@ public class Order extends Controller {
         if (pay_enterpriseid <= 0) {
             return getErrReturnObject().setErrMsg("请选择结算企业").toString();
         }
-
+        if(row.getBoolean("deleted")){
+            return getErrReturnObject().setErrMsg("订单已被删除！").toString();
+        }
 
         //通过版本更新订单表头数据
         beans.order.Order.updateOrderWithVersion(this);
@@ -3378,6 +3383,8 @@ public class Order extends Controller {
             if (dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion WHERE CURRENT_TIME> enddate AND siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'").isNotEmpty()) {
                 return getErrReturnObject().setErrMsg("该促销活动已截止，无法提交").toString();
             }
+        } if(row.getBoolean("deleted")){
+            return getErrReturnObject().setErrMsg("订单已被删除！").toString();
         }
 
 
@@ -3438,7 +3445,9 @@ public class Order extends Controller {
         beans.order.Order.updateOrderWithVersion(this);
 
         Row row = rows.get(0);
-
+        if(row.getBoolean("deleted")){
+            return getErrReturnObject().setErrMsg("订单已被删除！").toString();
+        }
         String sonum = row.getString("sonum");
         //验证结算企业
         Long sys_enterpriseid = row.getLong("sys_enterpriseid");
@@ -3517,6 +3526,9 @@ public class Order extends Controller {
         if (!isMonth(submitdate, date) && row.getString("type").equals("标准订单") && siteid.equalsIgnoreCase("ccyosg")) {
             return getErrReturnObject().setErrMsg("标准订单无法跨月退回").toString();
         }
+        if(row.getBoolean("deleted")){
+            return getErrReturnObject().setErrMsg("订单已被删除！").toString();
+        }
 
         if (rows.get(0).getLong("sa_promotionid") != 0) {
             if (dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion WHERE CURRENT_TIME> enddate AND siteid='" + siteid + "' AND sa_promotionid='" + rows.get(0).getLong("sa_promotionid") + "'").isNotEmpty()) {
@@ -3652,6 +3664,9 @@ public class Order extends Controller {
         if (!row.getString("status").equals("提交")) {
             return getErrReturnObject().setErrMsg("非提交状态无法撤回").toString();
         }
+        if(row.getBoolean("deleted")){
+            return getErrReturnObject().setErrMsg("订单已被删除！").toString();
+        }
         Long sa_accountclassid = row.getLong("sa_accountclassid");
         //验证结算企业
         Long pay_enterpriseid = row.getLong("pay_enterpriseid");
@@ -3841,6 +3856,9 @@ public class Order extends Controller {
         beans.order.Order.updateOrderWithVersion(this);
 
         Row row = rows.get(0);
+        if(row.getBoolean("deleted")){
+            return getErrReturnObject().setErrMsg("订单已被删除！").toString();
+        }
         Long sa_accountclassid = row.getLong("sa_accountclassid");
         //验证结算企业
         Long pay_enterpriseid = row.getLong("pay_enterpriseid");

src/custom/restcontroller/webmanage/sale/order/SQL/订单_提交.sql

@@ -8,4 +8,4 @@ set changeuserid=$userid$,
     freightstatus = $freightstatus$
 where siteid = $siteid$
   and sa_orderid = $sa_orderid$
-  and status in ('新建','确认')
+  and status in ('新建','确认') and deleted=0

src/custom/restcontroller/webmanage/sale/order/SQL/订单_撤回.sql

@@ -7,4 +7,4 @@ set changeuserid=$userid$,
     status      = '新建'
 where siteid = $siteid$
   and sa_orderid in $sa_orderid$
-and  status      in ('提交')
+and  status      in ('提交') and deleted=0

src/custom/restcontroller/webmanage/sale/order/SQL/订单_更新.sql

@@ -36,4 +36,4 @@ set changeuserid=$userid$,
     submitphonenumber=$submitphonenumber$,
     logisticsmethod=$logisticsmethod$
 where siteid = $siteid$
-  and sa_orderid = $sa_orderid$
+  and sa_orderid = $sa_orderid$  and deleted=0

src/custom/restcontroller/webmanage/sale/order/SQL/订单_详情.sql

@@ -103,4 +103,4 @@ FROM sa_order t1
          left join sa_accountbalance t14 on t1.sys_enterpriseid=t14.sys_enterpriseid and t1.sa_accountclassid=t14.sa_accountclassid and t1.siteid=t14.siteid
          left join sa_accountclass t15 on t1.sa_accountclassid=t15.sa_accountclassid and t1.siteid=t15.siteid
 WHERE t1.sa_orderid = $sa_orderid$
-  AND t1.siteid = $siteid$
+  AND t1.siteid = $siteid$ and t1.deleted=0

src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursement.java

@@ -333,7 +333,7 @@ public class tpartreimbursement extends Controller {
         orderitemsQuery.setTableAlias("t1");
         orderitemsQuery.addJoinTable(JOINTYPE.left, tpartreimbursementdetailQuery, "t2", "t1.sa_orderitemsid=t2.sa_orderitemsid");
         orderitemsQuery.setWhere("t1.sa_orderitemsid", rowsdetail.toArrayList("sa_orderitemsid"));
-        orderitemsQuery.addQueryFields("qty", "t1.tobeoffqty-ifnull(t2.sumqty,0)");
+        orderitemsQuery.addQueryFields("qty", "t1.canoffqty-ifnull(t2.sumqty,0)");
         Rows orderitemsrows = orderitemsQuery.query();
         RowsMap rowsMap = orderitemsrows.toRowsMap("sa_orderitemsid");
         if (!rows.get(0).getBoolean("createflag")) {
@@ -349,16 +349,12 @@ public class tpartreimbursement extends Controller {
             if (rowsMap.containsKey(sa_orderitemsid)) {
                 //审核数量
                 BigDecimal checkqty = rowsdetail.get(i).getBigDecimal("checkqty");
-                //订单明细中的数量
+                //剩余可核销数量
                 BigDecimal qty = rowsMap.get(sa_orderitemsid).get(0).getBigDecimal("qty");
-                //订单明细中的可核销数量
-                BigDecimal canoffqty = rowsMap.get(sa_orderitemsid).get(0).getBigDecimal("canoffqty");
-                if (qty.compareTo(checkqty) < 0 && checkqty.compareTo(BigDecimal.ZERO) > 0) {
+                if (checkqty.compareTo(qty) > 0 && checkqty.compareTo(BigDecimal.ZERO) > 0) {
                     return getErrReturnObject().setErrMsg("该配件核销单数量不符合要求，请检查订单明细数量").toString();
                 }
-                if (canoffqty.compareTo(checkqty) < 0 && checkqty.compareTo(BigDecimal.ZERO) > 0) {
-                    return getErrReturnObject().setErrMsg("该配件核销单数量不符合要求，请检查订单明细可核销数量").toString();
-                }
+
             } else {
                 return getErrReturnObject().setErrMsg("订单行不存在，请检查").toString();
             }