Redeem 1 tahun lalu
induk
melakukan
e2e241ab2b

+ 6 - 1
src/main/java/com/steerinfo/dil/service/impl/OyeWarehouseServiceImpl.java

@@ -334,7 +334,12 @@ public class OyeWarehouseServiceImpl implements IOyeWarehouseService {
                 amsSaleMaterial.setSteelMeter(steelMeters);
             }
             // 是否磅重销售(0:磅重;1:理重)
-            BigDecimal isPoundSale = DataChange.dataToBigDecimal(map.get("isPound"));
+            BigDecimal isPoundSale = null;
+            if (map.containsKey("isPoundSale")) {
+                isPoundSale = DataChange.dataToBigDecimal(map.get("isPoundSale"));
+            }else {
+                isPoundSale = DataChange.dataToBigDecimal(map.get("isPound"));
+            }
             // 销售订单物资表主键
             BigDecimal saleMaterialId = amsSaleMaterialMapper.selectMaxId();
             amsSaleMaterial.setSaleMaterialId(saleMaterialId);

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -5262,7 +5262,7 @@
                     RDSC.DISTRICT_CITY,
                     RDSC.TOWN_CITY
     FROM RMS_DIRECTLY_SENT_CITY RDSC
-    WHERE RDSC.DIRECTLY_SENT_NAME = #{saleRemark}
+    WHERE instr(#{saleRemark},RDSC.DIRECTLY_SENT_NAME) >= 0
       AND RDSC.PROVINCE_CITY = #{province}
       AND DISTRICT_CITY = #{district}
       AND RDSC.TOWN_CITY = #{town}