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

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

@@ -576,7 +576,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result=0;
         BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
         Map<String, Object> mesMap = omstruckOrderSeparateMapper.getOrderMesByOrderId(orderId);
-        if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() > 1){
+        if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1){
             throw new Exception("撤单失败");
         }
         BigDecimal orderPlanId = DataChange.dataToBigDecimal(mesMap.get("orderPlanId"));
@@ -640,13 +640,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return result;
     }
 
-    @Test
-    public static void main(String[] args) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        System.out.println(new Date());
-        String dateStr = sdf.format(new Date());
-        System.out.println(dateStr);
-    }
    //修改运力
     @Override
     public int updateCapacityId(Map<String,Object> map) {