Browse Source

商品调价单导入调整

郭齐峰 1 year ago
parent
commit
ec810e5b89

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

@@ -356,7 +356,7 @@ public class ItempriceadjustItemprice extends Controller {
 
                             BigDecimal price = new BigDecimal(row.getString("price" + i));
                             if (row.getString("price" + i).equals("0")) {
-                                price = pricegrade.get(String.valueOf(i)).get(0).getBigDecimal("price");
+                                price = oldprice;
                             }
                             sqlFactoryupload.addParameter("price", price);
                             sqllist.add(sqlFactoryupload.getSQL());

+ 1 - 1
src/custom/restcontroller/webmanage/sale/itempriceadjust/SQL/商品调价单商品明细列表情查询.sql

@@ -33,7 +33,7 @@ FROM sa_itempriceadjust_items t1
     AND t5.pricegrade = 4
          LEFT JOIN sa_itempriceadjust_itemprice t6 ON t1.sa_itempriceadjust_itemsid = t6.sa_itempriceadjust_itemsid
     AND t1.siteid = t6.siteid
-    AND t5.pricegrade = 5
+    AND t6.pricegrade = 5
          LEFT JOIN plm_item t7 ON t7.siteid = t1.siteid
     AND t7.itemid = t1.itemid
          left join plm_unit t8 on t7.siteid = t8.siteid and t7.unitid = t8.unitid