HUJIANGUO 3 năm trước cách đây
mục cha
commit
a76e833c04

+ 4 - 4
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -227,10 +227,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     amsSaleMaterial.setInsertUsername("金蝶");
                     amsSaleMaterial.setMeterWeight(DataChange.dataToBigDecimal(meterWeight));
                     amsSaleMaterial.setInsertUpdateRemark("采集金蝶销售订单");
-                    if (materialWeight != null && "undefined".equals(materialWeight)) {
+                    if (materialWeight != null && "".equals(materialWeight)) {
                         amsSaleMaterial.setMaterialWeight(new BigDecimal(materialWeight));
                     }
-                    if (materialNumber != null && "undefined".equals(materialNumber)) {
+                    if (materialNumber != null && "".equals(materialNumber)) {
                         amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
                     }
                     result += amsSaleMaterialMapper.insertSelective(amsSaleMaterial);
@@ -300,10 +300,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     String materialCode = (String) materialMap.get("materialCode");
                     // 得到计量单位
                     String materialUnit = (String) materialMap.get("materialUnit");
-                    if (materialWeight != null && "undefined".equals(materialWeight)) {
+                    if (materialWeight != null && "".equals(materialWeight)) {
                         amsSaleMaterial.setMaterialWeight(new BigDecimal(materialWeight));
                     }
-                    if (materialNumber != null && "undefined".equals(materialNumber)) {
+                    if (materialNumber != null && "".equals(materialNumber)) {
                         amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
                     }
                     BigDecimal materialId = amsSaleMaterialMapper.getMaterialId(materialCode);