'销售订单bug修改'

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

@@ -227,8 +227,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     amsSaleMaterial.setInsertUsername("金蝶");
                     amsSaleMaterial.setMeterWeight(DataChange.dataToBigDecimal(meterWeight));
                     amsSaleMaterial.setInsertUpdateRemark("采集金蝶销售订单");
-                    amsSaleMaterial.setMaterialWeight(new BigDecimal(materialWeight));
-                    amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
+                    if (materialWeight != null && "undefined".equals(materialWeight)) {
+                        amsSaleMaterial.setMaterialWeight(new BigDecimal(materialWeight));
+                    }
+                    if (materialNumber != null && "undefined".equals(materialNumber)) {
+                        amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
+                    }
                     result += amsSaleMaterialMapper.insertSelective(amsSaleMaterial);
                 }
                 result += amsSaleOrderMapper.insertSelective(amsSaleOrder);
@@ -296,14 +300,17 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     String materialCode = (String) materialMap.get("materialCode");
                     // 得到计量单位
                     String materialUnit = (String) materialMap.get("materialUnit");
-                    amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
-                    amsSaleMaterial.setMaterialWeight(new BigDecimal(materialWeight));
+                    if (materialWeight != null && "undefined".equals(materialWeight)) {
+                        amsSaleMaterial.setMaterialWeight(new BigDecimal(materialWeight));
+                    }
+                    if (materialNumber != null && "undefined".equals(materialNumber)) {
+                        amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
+                    }
                     BigDecimal materialId = amsSaleMaterialMapper.getMaterialId(materialCode);
                     amsSaleMaterial.setEasPrimaryId(easPrimaryId);
                     amsSaleMaterial.setSaleOrderId(amsSaleOrder.getSaleOrderId());
                     amsSaleMaterial.setMaterialId(materialId);
                     amsSaleMaterial.setInsertTime(new Date());
-
                     result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
                 }
                 result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/join
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8