Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API

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

@@ -387,6 +387,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     if (saleMaterialId != null && (!saleMaterialId.equals("null")) && !saleMaterialId.equals("")) {
                         amsSaleMaterial = amsSaleMaterialMapper.selectByPrimaryKey(new BigDecimal(saleMaterialId));
                         Object meterWeight = materialMap.get("meterWeight");
+                        Object forChangdu = materialMap.get("forChangdu");
+                        if(forChangdu != null && !"".equals(forChangdu.toString())){
+                            amsSaleMaterial.setSteelMeter(DataChange.dataToBigDecimal(forChangdu));
+                        }
                         if (meterWeight != null && !"".equals(meterWeight.toString())) {
                             amsSaleMaterial.setMeterWeight(DataChange.dataToBigDecimal(meterWeight));
                         }

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

@@ -89,11 +89,11 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
             rmsMaterialType.setUpdateUsername("admin");
             rmsMaterialType.setInsertUpdateRemark("采集金蝶数据");
             rmsMaterialTypeMapper.insertSelective(rmsMaterialType);
-            rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
+            //rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
         }
         else {
             RmsMaterialType rmsMaterialType = rmsMaterialTypes.get(0);
-            rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
+            //rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
         }
         // 判断单位是否已存在
         Map<String,Object> map3 = new HashMap<>();