提交代码

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -959,7 +959,11 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);
         //根据时间段查询数据
-        PageHelper.startPage(pageNum, pageSize);
+        if(pageNum ==null && pageSize==null){
+
+        }else {
+            PageHelper.startPage(pageNum, pageSize);
+        }
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getHaveCarTruckNoList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId,null, saleOrderList);
@@ -1583,9 +1587,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                 saleOrderNo = map.get("saleOrderNo").toString();
                 count++;
                 int saleOrderId= amsSaleOrderService.addSteelSaleOrder(map);
-                if (map.get("isUploadEas") != null && saleOrderId != 0) {
+                /*if (map.get("isUploadEas") != null && saleOrderId != 0) {
                     amsSaleOrderService.uploadSaleOrder(new BigDecimal(saleOrderId));
-                }
+                }*/
             }
         } catch (Exception e) {
             return failed("销售订单编号为:" + saleOrderNo + e.getMessage());