tiaji

src/main/java/com/steerinfo/dil/service/IOmstruckOrderSeparateService.java

@@ -35,4 +35,6 @@ public interface IOmstruckOrderSeparateService {
 
     //新增一个新的采购运输订单（一车多趟）
     int addNewTransportOrder(BigDecimal orderId);
+
+    List<Map<String,Object>> getOrderMaterial(Integer orderId);
 }

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

@@ -590,7 +590,18 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         return allLoaderLoadingOrder;
     }
 
+    @Override
     public List<Map<String,Object>> getOrderMaterial(Integer orderId) {
-        return omstruckOrderMaterialMapper.getOrderMaterial(orderId);
+        List<Map<String,Object>>maplist =  omstruckOrderMaterialMapper.getOrderMaterial(orderId);
+        for (Map<String,Object>map:maplist
+             ) {
+            if(map.get("materialModel") == null){
+                String materialName = (String)map.get("materialName");
+                String materialName1 = materialName.replace("()","");
+                map.replace("materialName",materialName,materialName1);
+            }
+        }
+        return maplist;
     }
+
 }

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.xml

@@ -457,10 +457,11 @@
     <include refid="select"/>
     where ORDER_ID = #{orderId,jdbcType=DECIMAL}
   </select>
-  <select id="getOrderMaterial" resultType="java.util.Map" parameterType="decimal">
+  <select id="getOrderMaterial" resultType="java.util.Map" parameterType="java.lang.Integer">
     select
     OOM.MATERIAL_MEASSION "materialMeassion",
-    RM.MATERIAL_NAME ||RM.MATERIAL_SPECIFICATION ||'('|| RM.MATERIAL_CODE ||')'"materialName",
+    RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_NAME ||RM.MATERIAL_SPECIFICATION ||'('|| RM.MATERIAL_MODEL ||')'"materialName",
     OOM.MATERIAL_ID  "materialId"
     from OMSTRUCK_ORDER_MATERIAL OOM
     LEFT JOIN RMS_MATERIAL RM