zxf 2 settimane fa
parent
commit
87751044f9

+ 1 - 1
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizWaybillCostDetailsController.java

@@ -79,7 +79,7 @@ public class BizWaybillCostDetailsController extends BaseController
     /**
      * 导出运单明细列表
      */
-   // @RequiresPermissions("system:costDetails:export")
+    @RequiresPermissions("system:costDetails:export")
     @Log(title = "运单明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizWaybillCostDetails bizWaybillCostDetails)

+ 5 - 2
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizWaybillOrderController.java

@@ -207,7 +207,10 @@ public class BizWaybillOrderController extends BaseController
                 }
                 total = orderList.size();
                 // 调用批量下单方法
-              //  bizWaybillOrderService.batchInsertJDBizWaybillOrder(orderList, orderType);
+              // 先不用  bizWaybillOrderService.batchInsertJDBizWaybillOrder(orderList, orderType);
+
+
+
                bizWaybillOrderService.asyncBatchInsertJd((List<BizWaybillOrder>) result.get("orderList"), orderType);
 
             }
@@ -230,7 +233,7 @@ public class BizWaybillOrderController extends BaseController
                 }
                 total=orderList.size();
                 // 调用异步批量下单方法
-               bizWaybillOrderService.asyncBatchInsert((List<BizWaybillOrder>) result.get("orderList"), orderType);
+              bizWaybillOrderService.asyncBatchInsert((List<BizWaybillOrder>) result.get("orderList"), orderType);
             }
             return AjaxResult.success(String.format("本次导入共【%d】条数据,后台已自动开启对接第三方接口下单,请 1-2 分钟后刷新列表仔细核对导入结果!",total));
 

+ 1 - 1
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizWaybillCostDetailsServiceImpl.java

@@ -51,7 +51,7 @@ public class BizWaybillCostDetailsServiceImpl implements IBizWaybillCostDetailsS
      * @return 运单明细
      */
     @Override
-    @DataScope(deptAlias = "d")
+    @DataScope(deptAlias = "a")
     public List<BizWaybillCostDetails> selectBizWaybillCostDetailsList(BizWaybillCostDetails bizWaybillCostDetails)
     {
         return bizWaybillCostDetailsMapper.selectBizWaybillCostDetailsList(bizWaybillCostDetails);