返退单bug修复

src/custom/beans/aftersalesmag/Aftersalesmag.java

@@ -15,7 +15,7 @@ public class Aftersalesmag {
      * 查询合同的签约价格
      *
      * @param controller
-     * @param sa_contractids
+     * @param sa_aftersalesmagids
      * @return
      * @throws YosException
      */

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

@@ -68,6 +68,8 @@ public class aftersalesmag extends Controller {
                     "select sa_orderid,sa_accountclassid,rebate_userate from sa_order where sa_orderid=" + sa_orderid);
             if (soaderRows.isEmpty()) {
                 //return getErrReturnObject().setErrMsg("该订单不存在").toString();
+                sqlFactory.addParameter("sa_accountclassid",content.getLong("sa_accountclassid"));
+                sqlFactory.addParameter("rebate_userate", 0);
             } else {
                 sqlFactory.addParameter("sa_accountclassid", soaderRows.get(0).getLong("sa_accountclassid"));
                 sqlFactory.addParameter("rebate_userate", soaderRows.get(0).getBigDecimal("rebate_userate"));
@@ -84,50 +86,21 @@ public class aftersalesmag extends Controller {
             if (rows.isNotEmpty()) {
                 if (rows.get(0).getString("status").equals("新建")) {
                     sqlFactory = new SQLFactory(this, "返退单更新");
-                    if (sys_enterpriseid == rows.get(0).getLong("sys_enterpriseid")) {
-                        sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
-                        if (sa_orderid == rows.get(0).getLong("sa_orderid")) {
-                            sqlFactory.addParameter("sa_orderid", sa_orderid);
-                            sqlFactory.addParameter("sa_accountclassid", rows.get(0).getLong("sa_accountclassid"));
-                            sqlFactory.addParameter("rebate_userate", rows.get(0).getBigDecimal("rebate_userate"));
-                        } else {
-                            sqlList.add("delete from sa_aftersalesmag_items WHERE sa_aftersalesmagid = "
-                                    + sa_aftersalesmagid);
-                            sqlFactory.addParameter("sa_orderid", sa_orderid);
-                            Rows soaderRows = dbConnect.runSqlQuery(
-                                    "select sa_orderid,sa_accountclassid,rebate_userate from sa_order where sys_enterpriseid=" + sys_enterpriseid + " and sa_orderid="
-                                            + sa_orderid);
-                            if (soaderRows.isEmpty()) {
-                                return getErrReturnObject().setErrMsg("该订单不存在").toString();
-                            } else {
-                                sqlFactory.addParameter("sa_accountclassid",
-                                        soaderRows.get(0).getLong("sa_accountclassid"));
-                                sqlFactory.addParameter("rebate_userate",
-                                        soaderRows.get(0).getBigDecimal("rebate_userate"));
-                            }
-                        }
+                    sqlList.add("delete from sa_aftersalesmag_items WHERE sa_aftersalesmagid = "
+                            + sa_aftersalesmagid);
+                    sqlFactory.addParameter("sa_orderid", sa_orderid);
+                    Rows soaderRows = dbConnect.runSqlQuery(
+                            "select sa_orderid,sa_accountclassid,rebate_userate from sa_order where sys_enterpriseid=" + sys_enterpriseid + " and sa_orderid="
+                                    + sa_orderid);
+                    if (soaderRows.isEmpty()) {
+                        //return getErrReturnObject().setErrMsg("该订单不存在").toString();
+                        sqlFactory.addParameter("sa_accountclassid",content.getLong("sa_accountclassid"));
+                        sqlFactory.addParameter("rebate_userate", 0);
                     } else {
-                        sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
-                        if (sa_orderid == rows.get(0).getLong("sa_orderid")) {
-                            sqlFactory.addParameter("sa_orderid", 0);
-                            sqlFactory.addParameter("sa_accountclassid", 0);
-                            sqlFactory.addParameter("rebate_userate", 0);
-                        } else {
-                            sqlList.add("delete from sa_aftersalesmag_items WHERE sa_aftersalesmagid = "
-                                    + sa_aftersalesmagid);
-                            sqlFactory.addParameter("sa_orderid", sa_orderid);
-                            Rows soaderRows = dbConnect.runSqlQuery(
-                                    "select sa_orderid,sa_accountclassid,rebate_userate from sa_order where sys_enterpriseid=" + sys_enterpriseid + " and sa_orderid="
-                                            + sa_orderid);
-                            if (soaderRows.isEmpty()) {
-                                return getErrReturnObject().setErrMsg("该订单不存在").toString();
-                            } else {
-                                sqlFactory.addParameter("sa_accountclassid",
-                                        soaderRows.get(0).getLong("sa_accountclassid"));
-                                sqlFactory.addParameter("rebate_userate",
-                                        soaderRows.get(0).getBigDecimal("rebate_userate"));
-                            }
-                        }
+                        sqlFactory.addParameter("sa_accountclassid",
+                                soaderRows.get(0).getLong("sa_accountclassid"));
+                        sqlFactory.addParameter("rebate_userate",
+                                soaderRows.get(0).getBigDecimal("rebate_userate"));
                     }
 
                     sqlList.add(DataContrlLog.createLog(this, "sa_aftersalesmag", sa_aftersalesmagid, "更新", "返退单更新成功")

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmagItems.java

@@ -71,13 +71,7 @@ public class aftersalesmagItems extends Controller {
         JSONArray iteminfos = content.getJSONArray("iteminfos");
         ArrayList<String> sqlList = new ArrayList<>();
         Rows rowscount = dbConnect.runSqlQuery("select status from sa_aftersalesmag where sa_aftersalesmagid=" + sa_aftersalesmagid);
-        if (!rowscount.isEmpty()) {
-            if (!rowscount.get(0).getString("status").equals("新建")) {
-                return getErrReturnObject().setErrMsg("非新建状态的返退单无法新增修改").toString();
-            }
-        } else {
-            return getErrReturnObject().setErrMsg("该返退单不存在").toString();
-        }
+
         int i = 0;
         long[] sa_aftersalesmag_itemsid = createTableID("sa_aftersalesmag_items", iteminfos.size());
 
@@ -90,6 +84,13 @@ public class aftersalesmagItems extends Controller {
                 Rows sa_aftersalesmag_itemsrows = dbConnect.runSqlQuery("select sa_aftersalesmag_itemsid,qty from sa_aftersalesmag_items where sa_aftersalesmagid="
                         + sa_aftersalesmagid + " and sa_orderitemsid=" + iteminfo.getLong("sa_orderitemsid"));
                 if (!sa_aftersalesmag_itemsrows.isEmpty()) {
+                    if (!rowscount.isEmpty()) {
+                        if (rowscount.get(0).getString("status").equals("复核")) {
+                            return getErrReturnObject().setErrMsg("复核状态的返退单无法修改").toString();
+                        }
+                    } else {
+                        return getErrReturnObject().setErrMsg("该返退单不存在").toString();
+                    }
                     SQLFactory saleFactory = new SQLFactory(this, "返退单明细更新");
                     saleFactory.addParameter("sa_aftersalesmag_itemsid", sa_aftersalesmag_itemsrows.get(0).getLong("sa_aftersalesmag_itemsid"));
                     // saleFactory.addParameter("itemno", iteminfo.getString("itemno"));
@@ -98,6 +99,13 @@ public class aftersalesmagItems extends Controller {
                     saleFactory.addParameter("reason", iteminfo.getStringValue("reason"));
                     sqlList.add(saleFactory.getSQL());
                 } else {
+                    if (!rowscount.isEmpty()) {
+                        if (!rowscount.get(0).getString("status").equals("新建")) {
+                            return getErrReturnObject().setErrMsg("非新建状态的返退单无法新增").toString();
+                        }
+                    } else {
+                        return getErrReturnObject().setErrMsg("该返退单不存在").toString();
+                    }
                     SQLFactory saleFactory = new SQLFactory(this, "返退单明细新增");
                     saleFactory.addParameter("siteid", siteid);
                     saleFactory.addParameter("sa_aftersalesmag_itemsid", sa_aftersalesmag_itemsid[i]);