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

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

@@ -566,7 +566,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //将订单状态设为未接收
         omstruckOrder.setOrderStatus(new BigDecimal(4));
         //讲路段顺序号设为空，适应进厂以后扫码
-        omstruckOrder.setOrderLineSequence(null);
+        omstruckOrder.setOrderLineSequence(new BigDecimal(0));
         result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         List<Map<String, Object>> allResultIdList = omstruckOrderMapper.getAllResultId(DataChange.dataToBigDecimal(orderId));
         for (Map<String,Object> allResultId:allResultIdList