解决授权表示

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/finance/FTmsaccbillsController.java

@@ -36,7 +36,7 @@ public class FTmsaccbillsController extends BaseController {
     /**
      * 查询财务主列表
      */
-    @PreAuthorize("@ss.hasPermi('finances:contrast:list')")
+    @PreAuthorize("@ss.hasPermi('finance:contrast:list')")
     @GetMapping("/list")
     public TableDataInfo list(FTmsaccbills fTmsaccbills)
     {
@@ -60,7 +60,7 @@ public class FTmsaccbillsController extends BaseController {
     /**
      * 新增财务数据主
      */
-    @PreAuthorize("@ss.hasPermi('finances:contrast:add')")
+    @PreAuthorize("@ss.hasPermi('finance:contrast:add')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     @RepeatSubmit
@@ -75,7 +75,7 @@ public class FTmsaccbillsController extends BaseController {
     /**
      *  查询详情
      */
-    @PreAuthorize("@ss.hasPermi('finances:contrast:query')")
+    @PreAuthorize("@ss.hasPermi('finance:contrast:query')")
     @GetMapping(value = "/{fId}")
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(fTmsaccbillsService.selectFTmsaccbillsAndItemsById(fId));
@@ -84,14 +84,14 @@ public class FTmsaccbillsController extends BaseController {
     /**
      * 删除财务数据主
      */
-    @PreAuthorize("@ss.hasPermi('finances:contrast:remove')")
+    @PreAuthorize("@ss.hasPermi('finance:contrast:remove')")
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds) {
         return toAjax(fTmsaccbillsService.deleteFTmsaccbillsByIds(fIds));
     }
 
-    @PreAuthorize("@ss.hasPermi('finances:contrast:remove')")
+    @PreAuthorize("@ss.hasPermi('finance:contrast:remove')")
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
@@ -101,7 +101,7 @@ public class FTmsaccbillsController extends BaseController {
     /**
      *   确认对账
      */
-    @PreAuthorize("@ss.hasPermi('finances:contrast:add')")
+    @PreAuthorize("@ss.hasPermi('finance:contrast:add')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/confirm")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/finance/TChargesController.java

@@ -37,7 +37,7 @@ public class TChargesController extends BaseController {
     /**
      * 查询财务主列表
      */
-    @PreAuthorize("@ss.hasPermi('finances:contrast:list')")
+    @PreAuthorize("@ss.hasPermi('finance:charge:list')")
     @GetMapping("/list")
     public TableDataInfo list(FTmsaccbills fTmsaccbills)
     {
@@ -62,7 +62,7 @@ public class TChargesController extends BaseController {
     /**
      * 新增财务数据主
      */
-    @PreAuthorize("@ss.hasPermi('finances:charge:add')")
+    @PreAuthorize("@ss.hasPermi('finance:charge:add')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     @RepeatSubmit
@@ -77,7 +77,7 @@ public class TChargesController extends BaseController {
     /**
      *  查询详情
      */
-    @PreAuthorize("@ss.hasPermi('finances:charge:query')")
+    @PreAuthorize("@ss.hasPermi('finance:charge:query')")
     @GetMapping(value = "/{fId}")
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(fTmsaccbillsService.selectFTmsaccbillsAndItemsById(fId));
@@ -86,14 +86,14 @@ public class TChargesController extends BaseController {
     /**
      * 删除财务数据主
      */
-    @PreAuthorize("@ss.hasPermi('finances:charge:remove')")
+    @PreAuthorize("@ss.hasPermi('finance:charge:remove')")
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds) {
         return toAjax(fTmsaccbillsService.deleteFTmsaccbillsByIds(fIds));
     }
 
-    @PreAuthorize("@ss.hasPermi('finances:charge:remove')")
+    @PreAuthorize("@ss.hasPermi('finance:charge:remove')")
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
@@ -103,7 +103,7 @@ public class TChargesController extends BaseController {
     /**
      *   确认收费
      */
-    @PreAuthorize("@ss.hasPermi('finances:charge:add')")
+    @PreAuthorize("@ss.hasPermi('finance:charge:add')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/confirm")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/finance/TPaymentsController.java

@@ -37,7 +37,7 @@ public class TPaymentsController extends BaseController {
     /**
      * 查询财务主列表
      */
-    @PreAuthorize("@ss.hasPermi('finances:contrast:list')")
+    @PreAuthorize("@ss.hasPermi('finance:payment:list')")
     @GetMapping("/list")
     public TableDataInfo list(FTmsaccbills fTmsaccbills)
     {
@@ -62,7 +62,7 @@ public class TPaymentsController extends BaseController {
     /**
      * 新增财务数据主
      */
-    @PreAuthorize("@ss.hasPermi('finances:payment:add')")
+    @PreAuthorize("@ss.hasPermi('finance:payment:add')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     @RepeatSubmit
@@ -77,7 +77,7 @@ public class TPaymentsController extends BaseController {
     /**
      *  查询详情
      */
-    @PreAuthorize("@ss.hasPermi('finances:payment:query')")
+    @PreAuthorize("@ss.hasPermi('finance:payment:query')")
     @GetMapping(value = "/{fId}")
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(fTmsaccbillsService.selectFTmsaccbillsAndItemsById(fId));
@@ -86,14 +86,14 @@ public class TPaymentsController extends BaseController {
     /**
      * 删除财务数据主
      */
-    @PreAuthorize("@ss.hasPermi('finances:payment:remove')")
+    @PreAuthorize("@ss.hasPermi('finance:payment:remove')")
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds) {
         return toAjax(fTmsaccbillsService.deleteFTmsaccbillsByIds(fIds));
     }
 
-    @PreAuthorize("@ss.hasPermi('finances:payment:remove')")
+    @PreAuthorize("@ss.hasPermi('finance:payment:remove')")
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
@@ -103,7 +103,7 @@ public class TPaymentsController extends BaseController {
     /**
      *   确认收费
      */
-    @PreAuthorize("@ss.hasPermi('finances:payment:add')")
+    @PreAuthorize("@ss.hasPermi('finance:payment:add')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/confirm")
     @RepeatSubmit

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillscarsServiceImpl.java

@@ -447,10 +447,6 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         if (StringUtils.isNotEmpty(objStatus)) {
             return AjaxResult.error(objStatus);
         }
-        String status = ftmsorderbillsService.dataValidation(null, attachs, fees, null, cars);
-        if (StringUtils.isNotEmpty(status)) {
-            return AjaxResult.error(status);
-        }
         Long billsStatus = 60L;
         Ftmsorderbillsplans tmsorderbillsplans = JSONArray.parseObject(plans, Ftmsorderbillsplans.class);
         Ftmsorderbills tmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
@@ -493,6 +489,11 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             tmsorderbillsplans.setUpdateBy(loginUser.getUsername());
             ftmsorderbillsplansMapper.updateftmsorderbillsplans(tmsorderbillsplans);
         } else {
+            String status = ftmsorderbillsService.dataValidation(null, attachs, fees, null, cars);
+            if (StringUtils.isNotEmpty(status)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return AjaxResult.error(status);
+            }
             // 提交
             tmsorderbillsplans.setBillStatus(60L);
             tmsorderbillsplans.setUpdateTime(new Date());
@@ -720,6 +721,8 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         map.put("plan", ftmsorderbillsplans);
         Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
         Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(ftmsorderbillsplans.getPId());
+        ftmsorderbillscntrs.setPlanQty(ftmsorderbillscntrs.getPlanQty() + ftmsorderbillscars.getCntrQty());
+        ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs);
         // 应收运价
         ftmsorderbillscars.setFreightPriceDr(ftmsorderbillscntrs.getPriceDr());
         // 应付运价
@@ -736,9 +739,10 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         ftmsorderbillscars.setCreateTime(new Date());
         ftmsorderbillscars.setMblno(ftmsorderbills.getMblno());
         ftmsorderbillscars.setCreateBy(loginUser.getUsername());
-        if (ftmsorderbillscarsMapper.updateftmsorderbillscars(ftmsorderbillscars) <= 0) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("更新车辆安排数据失败，若多次失败请联系管理员");
+        if (StringUtils.isNull(ftmsorderbillscars.getId())) {
+            ftmsorderbillscarsMapper.insertftmsorderbillscars(ftmsorderbillscars);
+        } else {
+            ftmsorderbillscarsMapper.updateftmsorderbillscars(ftmsorderbillscars);
         }
         map.put("cars", ftmsorderbillscars);
         SysUser sysUser = sysUserMapper.selectUserByTel(ftmsorderbillscars.getDriverTel());
@@ -790,6 +794,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度安排失败，若多次出现请联系管理员");
         }
+        Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(tmsorderbillsplans.getPId());
+        ftmsorderbillscntrs.setPlanQty(ftmsorderbillscntrs.getPlanQty() - ftmsorderbillscars.getCntrQty());
+        ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs);
         map.put("plan", tmsorderbillsplans);
         map.put("cars", ftmsorderbillscars);
         return AjaxResult.success(map);
@@ -851,6 +858,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度数据失败，若多次失败请联系管理员");
         }
+        Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(ftmsorderbillsplans.getPId());
+        ftmsorderbillscntrs.setPlanQty(ftmsorderbillscntrs.getPlanQty() - tmsorderbillscars.getCntrQty() + ftmsorderbillscars.getCntrQty());
+        ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs);
         Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
         ftmsorderbillscars.setBillStatus(6L);
         ftmsorderbillscars.setPlanDate(new Date());

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -412,9 +412,24 @@
             c.id,
             c.order_no orderNo,
             c.mblno,
-            c.load_date loadDate,
             c.carreg_no carregNo,
             driver.name,
+            c.driver_tel driverTel,
+            CASE
+            c.order_status
+            WHEN 10 THEN
+            '车队安排'
+            WHEN 20 THEN
+            '司机受理'
+            WHEN 40 THEN
+            '提箱'
+            WHEN 50 THEN
+            '装卸货'
+            WHEN 60 THEN
+            '还卸柜子'
+            WHEN 80 THEN
+            '回单'
+            END orderName,
             c.order_status orderStatus,
             p.f_name corpId,
             CASE
@@ -472,11 +487,23 @@
             c.accept_date acceptDate,
             c.cntr_qty cntrQty,
             c.off_data offData,
-            c.load_date cLoadDate,
+            c.load_date loadDate,
             c.md_load_date mdLoadDate,
             c.un_load_date unLoadDate,
             c.waybill_date waybillDate,
-            c.waybill_remarks waybillRemarks
+            c.waybill_remarks waybillRemarks,
+            c.oil_amt oilAmt,
+            c.cost_oth costOth,
+            c.driverbonus driverbonus,
+            c.cost_remarks costRemarks,
+            c.costom_amt_06 costomAmt06,
+            c.costom_amt_05 costomAmt05,
+            c.costom_amt_04 costomAmt04,
+            c.costom_amt_03 costomAmt03,
+            c.costom_amt_02 costomAmt02,
+            c.costom_amt_01 costomAmt01,
+            c.costom_str_02 costomStr02,
+            c.costom_str_01 costomStr01
         FROM
             F_TMSORDERBILLSCARS c
             LEFT JOIN F_TMSORDERBILLS t ON t.id = c.org_id

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillsplansMapper.xml

@@ -88,7 +88,7 @@
             f.qty_plan AS qtyPlan,
             f.qty_dis_patch AS qtyDisPatch,
             f.weight_plan AS weightPlan,
-            f.bill_status AS billStatus,
+            plan.bill_status AS billStatus,
             f.create_time AS createTime
         FROM
             F_TMSORDERBILLSPLANS plan

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -81,11 +81,11 @@ public class SysLoginService {
             LoginUser user = redisCache.getCacheObject(key);
             if (StringUtils.isNotEmpty(username) && StringUtils.isNotNull(user.getUser()))
             {
-                if (StringUtils.equals(username, user.getUsername()))
+                /*if (StringUtils.equals(username, user.getUsername()))
                 {
                     // 若发现有其他用户登录，顶替掉其他用户
                     redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + user.getToken());
-                }
+                }*/
             }
         }
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));