'ams提交dev'

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMaterialMapper.java

@@ -48,4 +48,6 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
     BigDecimal getMaterialWeightByOrderId(BigDecimal saleOrderId);
     //计算同一销售下的物资总净量
     BigDecimal getMaterialNetWeightBySaleId(BigDecimal saleOrderId);
+    // 得到是否是钢材
+    BigDecimal getIsSteel(BigDecimal lineId);
 }

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

@@ -324,6 +324,8 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             BigDecimal carrierId = DataChange.dataToBigDecimal(map.get("carrierId"));
             // 运输线路id
             BigDecimal lineId = DataChange.dataToBigDecimal(map.get("lineId"));
+            // 通过线路id判断是否是钢材
+            BigDecimal isSteel = amsSaleOrderMaterialMapper.getIsSteel(lineId);
             // 物资重量
             BigDecimal materialNumber = DataChange.dataToBigDecimal(map.get("orderPlanWeight"));
             // 车牌号
@@ -413,8 +415,17 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             omstruckOrder.setOrderIssueTime(new Date());
             // 运单状态
             omstruckOrder.setOrderStatus(new BigDecimal(4));
-            // 订单类型(非钢材销售)
-            omstruckOrder.setOrderType(new BigDecimal(2));
+            BigDecimal status;
+            // 非钢材（危化品和焦炭）
+            if (isSteel != null && (isSteel.intValue() == 3 || isSteel.intValue() == 4)) {
+                status = new BigDecimal(2);
+            }
+            // 钢材
+            else {
+                status = new BigDecimal(1);
+            }
+            // 订单类型
+            omstruckOrder.setOrderType(status);
             // 运输线路id
             omstruckOrder.setLineId(lineId);
             /*

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

@@ -731,4 +731,10 @@
                      ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
     WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
   </select>
+
+  <select id="getIsSteel" parameterType="DECIMAL" resultType="DECIMAL">
+    SELECT RL.IS_STEEL AS "isSteel"
+    FROM RMS_LINE RL
+    WHERE RL.LINE_ID = #{lineId}
+  </select>
 </mapper>