'磅重'

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -543,7 +543,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         BigDecimal salerId = DataChange.dataToBigDecimal(mapValue.get("salerId"));
         if (salerId == null || salerId.intValue() == 0) {
             salerId = amsSaleOrderMapper.findSalerId(mapValue.get("salerName"));
-            if (receiveId == null) {
+            if (salerId == null) {
                 throw new Exception("您输入的业务员：" + mapValue.get("salerName") +"不存在！！");
             }
         }
@@ -603,7 +603,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     addressMap.put("district",district);
                     addressMap.put("town",town);
                     shippingAddressId = amsSaleOrderMapper.findAddressId(addressMap);
-                    if (receiveId == null) {
+                    if (shippingAddressId == null) {
                         throw new Exception("您输入的：" + province + district + town + "地址不存在！！");
                     }
                 }
@@ -724,15 +724,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             }
             // 是否磅重销售（0：磅重；1：理重）
             BigDecimal isPoundSale = DataChange.dataToBigDecimal(map.get("isPoundSale"));
-            if (isPoundSale == null || isPoundSale.intValue() == 0) {
-                String poundOrTheory = (String) map.get("poundOrTheory");
-                if (poundOrTheory.equals("是")) {
-                    isPoundSale = new BigDecimal(0);
-                }
-                if (poundOrTheory.equals("否")) {
-                    isPoundSale = new BigDecimal(1);
-                }
-            }
             // 销售订单物资表主键
             BigDecimal saleMaterialId = amsSaleMaterialMapper.selectMaxId();
             amsSaleMaterial.setSaleMaterialId(saleMaterialId);