Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -2148,8 +2148,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                             String steelmeter1 = steelmeter.toString();
                             steelmeter1+="米";
                             //原来的物资名称
-                            String materialName = (String) stringObjectMap.get("materialName");
-                            stringObjectMap.put("materialName",materialName+" "+steelmeter1);
+                            String materialMC = (String) stringObjectMap.get("materialMC");
+                            stringObjectMap.put("materialMC",materialMC+" "+steelmeter1);
                         }
                     }
                 }