瀏覽代碼

Merge branch 'develop' into develop2

郭齐峰 11 月之前
父節點
當前提交
6e1edffdce

+ 6 - 1
src/custom/restcontroller/webmanage/sale/itempriceadjust/ItempriceadjustItemprice.java

@@ -300,6 +300,12 @@ public class ItempriceadjustItemprice extends Controller {
                     continue;
                 } else {
                     String itemno = row.getString("itemno");
+                    if (itemnoList.indexOf(itemno) != itemnoList.lastIndexOf("itemno")) {
+                        iserr = true;
+                        row.put("msg", "错误信息:导入文件存在相同编码的商品");
+                        rowserr.add(row);
+                        continue;
+                    }
                     if (itemnoRowsMap.containsKey(itemno)) {
                         row.put("itemid", itemnoRowsMap.get(itemno).get(0).getLong("itemid"));
                         row.put("oldmarketprice", itemnoRowsMap.get(itemno).get(0).getBigDecimal("marketprice"));
@@ -309,7 +315,6 @@ public class ItempriceadjustItemprice extends Controller {
                         rowserr.add(row);
                         continue;
                     }
-
                 }
                 if (StringUtils.isEmpty(row.getString("price1")) ||
                         StringUtils.isEmpty(row.getString("price2")) ||