Merge branch 'dev'

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

@@ -192,6 +192,9 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         omstruckOrder.setInsertUsername(userId);
         omstruckOrder.setInsertUpdateRemark("无");
         omstruckOrder.setLineId(lineId);
+        if (map.get("carrierId")!=null) {
+            omstruckOrder.setCarrierId(DataChange.dataToBigDecimal(map.get("carrierId")));
+        }
         //新增总实绩id
         TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
         tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectTmstruckTotalResultId());
@@ -449,9 +452,13 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 amstruckSporadicOrder.setDispatchStatus(new BigDecimal(1));
                 amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
                 //根据运输订单id查找订单信息
-                Map<String, Object> map2 = amstruckSporadicOrderMapper.selectOrderInfo(orderId);
                 //生成新的订单
                 OmstruckOrder omstruckOrder=new OmstruckOrder();
+                Map<String, Object> map2 = amstruckSporadicOrderMapper.selectOrderInfo(orderId);
+                BigDecimal carrierId =(BigDecimal) map2.get("carrierId");
+                if (carrierId!=null){
+                    omstruckOrder.setCarrierId(carrierId);
+                }
                 BigDecimal orderId1 = omstruckOrderMapper.selectMaxId();
                 omstruckOrder.setOrderId(orderId1);
                 omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map2.get("orderPlanId")));

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

@@ -741,7 +741,8 @@
                OOM.ORDER_MATERIAL_NUMBER "materialNumber",
                OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
                OOM.MATERIAL_PRIORITY "materialPriority",
-               OO.ORDER_TYPE "orderType"
+               OO.ORDER_TYPE "orderType",
+               OO.CARRIER_ID "carrierId"
         from OMSTRUCK_ORDER OO
                  left join OMSTRUCK_ORDER_MATERIAL OOM
                            on OO.ORDER_ID=OOM.ORDER_ID