商品调价单导入调整

src/custom/restcontroller/webmanage/sale/itempriceadjust/ExportExcel.java

@@ -193,23 +193,23 @@ public class ExportExcel {
 
         cell = row.createCell(2);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("一级调整价(必填,价格不变时填0)");
+        cell.setCellValue("一级调整价(必填,价格不变时填原价)");
 
         cell = row.createCell(3);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("二级调整价(必填,价格不变时填0)");
+        cell.setCellValue("二级调整价(必填,价格不变时填原价)");
 
         cell = row.createCell(4);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("三级调整价(必填,价格不变时填0)");
+        cell.setCellValue("三级调整价(必填,价格不变时填原价)");
 
         cell = row.createCell(5);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("四级调整价(必填,价格不变时填0)");
+        cell.setCellValue("四级调整价(必填,价格不变时填原价)");
 
         cell = row.createCell(6);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("五级调整价(必填,价格不变时填0)");
+        cell.setCellValue("五级调整价(必填,价格不变时填原价)");
 
 
 
@@ -303,23 +303,23 @@ public class ExportExcel {
 
         cell = row.createCell(2);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("一级调整价(必填,可为0)");
+        cell.setCellValue("一级调整价(必填,价格不变时填原价)");
 
         cell = row.createCell(3);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("二级调整价(必填,可为0)");
+        cell.setCellValue("二级调整价(必填,价格不变时填原价)");
 
         cell = row.createCell(4);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("三级调整价(必填,可为0)");
+        cell.setCellValue("三级调整价(必填,价格不变时填原价)");
 
         cell = row.createCell(5);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("四级调整价(必填,可为0)");
+        cell.setCellValue("四级调整价(必填,价格不变时填原价)");
 
         cell = row.createCell(6);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("五级调整价(必填,可为0)");
+        cell.setCellValue("五级调整价(必填,价格不变时填原价)");
 
 
         cell = row.createCell(7);

src/custom/restcontroller/webmanage/sale/itempriceadjust/ItempriceadjustItemprice.java

@@ -339,28 +339,25 @@ public class ItempriceadjustItemprice extends Controller {
                         pricegrade = itemPriceRows.toRowsMap("pricegrade");
                     }
                     for (int i = 1; i <= 5; i++) {
-                        if (pricegrade.containsKey(String.valueOf(i)) || !row.getString("price" + i).equals("0")) {
-                            sqlFactoryupload = new SQLFactory(this, "商品调价单商品价格明细新增");
-                            long sa_itempriceadjust_itempriceid = createTableID("sa_itempriceadjust_itemprice");
-                            sqlFactoryupload.addParameter("sa_itempriceadjust_itempriceid", sa_itempriceadjust_itempriceid);
-                            sqlFactoryupload.addParameter("sa_itempriceadjustid", sa_itempriceadjustid);
-                            sqlFactoryupload.addParameter("sa_itempriceadjust_itemsid", sa_itempriceadjust_itemsid);
-                            sqlFactoryupload.addParameter("siteid", siteid);
-                            sqlFactoryupload.addParameter("pricegrade", i);
-                            BigDecimal oldprice = new BigDecimal("0");
-
-                            if (pricegrade.containsKey(String.valueOf(i))) {
-                                oldprice = pricegrade.get(String.valueOf(i)).get(0).getBigDecimal("price");
-                            }
-                            sqlFactoryupload.addParameter("oldprice", oldprice);
-
-                            BigDecimal price = new BigDecimal(row.getString("price" + i));
-                            if (row.getString("price" + i).equals("0")) {
-                                price = oldprice;
-                            }
-                            sqlFactoryupload.addParameter("price", price);
-                            sqllist.add(sqlFactoryupload.getSQL());
+//                        if (pricegrade.containsKey(String.valueOf(i)) || !row.getString("price" + i).equals("0")) {
+                        sqlFactoryupload = new SQLFactory(this, "商品调价单商品价格明细新增");
+                        long sa_itempriceadjust_itempriceid = createTableID("sa_itempriceadjust_itemprice");
+                        sqlFactoryupload.addParameter("sa_itempriceadjust_itempriceid", sa_itempriceadjust_itempriceid);
+                        sqlFactoryupload.addParameter("sa_itempriceadjustid", sa_itempriceadjustid);
+                        sqlFactoryupload.addParameter("sa_itempriceadjust_itemsid", sa_itempriceadjust_itemsid);
+                        sqlFactoryupload.addParameter("siteid", siteid);
+                        sqlFactoryupload.addParameter("pricegrade", i);
+                        BigDecimal oldprice = new BigDecimal("0");
+
+                        if (pricegrade.containsKey(String.valueOf(i))) {
+                            oldprice = pricegrade.get(String.valueOf(i)).get(0).getBigDecimal("price");
                         }
+                        sqlFactoryupload.addParameter("oldprice", oldprice);
+
+                        BigDecimal price = new BigDecimal(row.getString("price" + i));
+                        sqlFactoryupload.addParameter("price", price);
+                        sqllist.add(sqlFactoryupload.getSQL());
+//                        }
 
                     }
                 }