返退商品明细可重复添加商品

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

@@ -44,9 +44,9 @@ public class aftersalesmagItems extends Controller {
             }
         }
         SQLFactory sqlFactory;
-        if(sa_orderid>0){
+        if (sa_orderid > 0) {
             sqlFactory = new SQLFactory(this, "返退商品列表查询", pageSize, pageNumber, pageSorting);
-        }else {
+        } else {
             sqlFactory = new SQLFactory(this, "商品列表查询", pageSize, pageNumber, pageSorting);
         }
 
@@ -61,7 +61,7 @@ public class aftersalesmagItems extends Controller {
         RowsMap attRowsMap = getAttachmentUrl("plm_item", ids);
 
         for (Row row : rows) {
-            if(!row.containsKey("price")){
+            if (!row.containsKey("price")) {
                 ItemPrice itemPrice = ItemPrice.getItemPrice(this, sys_enterpriseid, row.getLong("itemid"));
                 row.put("price", itemPrice.getPrice());
             }
@@ -79,6 +79,14 @@ public class aftersalesmagItems extends Controller {
         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,14 +98,7 @@ public class aftersalesmagItems extends Controller {
                     .isEmpty()) {
                 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();
-                    }
+                if (!sa_aftersalesmag_itemsrows.isEmpty() && sa_aftersalesmag_itemsrows.get(0).getLong("sa_aftersalesmag_itemsid") > 0) {
                     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"));
@@ -107,13 +108,6 @@ 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]);