调整文件夹名称

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCarManageController.java

@@ -5,8 +5,8 @@ import java.util.Map;
 
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.orderManagement.BasicData.domain.FleetCarManage;
-import com.ruoyi.orderManagement.BasicData.service.IFleetCarManageService;
+import com.ruoyi.basicData.domain.FleetCarManage;
+import com.ruoyi.basicData.service.IFleetCarManageService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCompanyMsgController.java

@@ -5,8 +5,8 @@ import java.util.List;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
-import com.ruoyi.orderManagement.BasicData.service.IFleetCompanyMsgService;
+import com.ruoyi.basicData.domain.FleetCompanyMsg;
+import com.ruoyi.basicData.service.IFleetCompanyMsgService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetDriverMsgController.java

@@ -6,8 +6,8 @@ import java.util.Map;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.orderManagement.BasicData.domain.FleetDriverMsg;
-import com.ruoyi.orderManagement.BasicData.service.IFleetDriverMsgService;
+import com.ruoyi.basicData.domain.FleetDriverMsg;
+import com.ruoyi.basicData.service.IFleetDriverMsgService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/ftmsorderbillsController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillsController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.fleet;
+package com.ruoyi.web.controller.fleet.orderPlan;
 
 import java.util.List;
 import java.util.Map;
@@ -8,8 +8,8 @@ import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.orderManagement.domain.Ftmsorderbills;
-import com.ruoyi.orderManagement.service.IftmsorderbillsService;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.service.IftmsorderbillsService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/ftmsorderbillscarsController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillscarsController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.fleet;
+package com.ruoyi.web.controller.fleet.orderPlan;
 
 import java.util.List;
 import java.util.Map;
@@ -9,9 +9,9 @@ import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.orderManagement.domain.Ftmsorderbills;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscars;
-import com.ruoyi.orderManagement.service.IftmsorderbillscarsService;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
+import com.ruoyi.orderPlan.service.IftmsorderbillscarsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -86,7 +86,7 @@ public class ftmsorderbillscarsController extends BaseController {
      * 根据司机id查询详细信息
      */
 //    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:query')")
-    @PostMapping(value = "selectDriver")
+    @PostMapping(value = "/selectDriver")
     public AjaxResult selectDriver(@RequestBody Ftmsorderbillscars ftmsorderbillscars) {
         if (StringUtils.isNull(ftmsorderbillscars) || StringUtils.isNull(ftmsorderbillscars.getId())) {
             return AjaxResult.error("未找到查询条件，请确认");

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/ftmsorderbillscntrsController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillscntrsController.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.controller.fleet;
+package com.ruoyi.web.controller.fleet.orderPlan;
 
 import java.util.List;
 
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscntrs;
-import com.ruoyi.orderManagement.service.IftmsorderbillscntrsService;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscntrs;
+import com.ruoyi.orderPlan.service.IftmsorderbillscntrsService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/ftmsorderbillsplansController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillsplansController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.fleet;
+package com.ruoyi.web.controller.fleet.orderPlan;
 
 import java.util.List;
 import java.util.Map;
@@ -9,10 +9,10 @@ import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.orderManagement.domain.Ftmsorderbills;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsplans;
-import com.ruoyi.orderManagement.service.IftmsorderbillsService;
-import com.ruoyi.orderManagement.service.IftmsorderbillsplansService;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsplans;
+import com.ruoyi.orderPlan.service.IftmsorderbillsService;
+import com.ruoyi.orderPlan.service.IftmsorderbillsplansService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/statusTracking/ftmsorderbillsfeesController.java

@@ -1,26 +1,15 @@
 package com.ruoyi.web.controller.fleet.statusTracking;
 
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscars;
-import com.ruoyi.orderManagement.service.IftmsorderbillscarsService;
-import com.ruoyi.orderManagement.statusTracking.service.IftmsorderbillsfeesService;
+import com.ruoyi.statusTracking.service.IftmsorderbillsfeesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 单趟费用Controller
  *

ruoyi-common/pom.xml

@@ -52,7 +52,7 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-  
+
         <!-- JSON工具类 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -152,7 +152,6 @@
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk16</artifactId>
             <version>1.46</version>
-            <scope>local</scope>
         </dependency>
 
     </dependencies>

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/domain/FleetCarManage.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/domain/FleetCarManage.java

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.BasicData.domain;
+package com.ruoyi.basicData.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/domain/FleetCompanyMsg.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/domain/FleetCompanyMsg.java

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.BasicData.domain;
+package com.ruoyi.basicData.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/domain/FleetDriverMsg.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/domain/FleetDriverMsg.java

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.BasicData.domain;
+package com.ruoyi.basicData.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/mapper/FleetCarManageMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/mapper/FleetCarManageMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.orderManagement.BasicData.mapper;
+package com.ruoyi.basicData.mapper;
 
 
-import com.ruoyi.orderManagement.BasicData.domain.FleetCarManage;
+import com.ruoyi.basicData.domain.FleetCarManage;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/mapper/FleetCompanyMsgMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/mapper/FleetCompanyMsgMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.orderManagement.BasicData.mapper;
+package com.ruoyi.basicData.mapper;
 
 
-import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
+import com.ruoyi.basicData.domain.FleetCompanyMsg;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/mapper/FleetDriverMsgMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/mapper/FleetDriverMsgMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.orderManagement.BasicData.mapper;
+package com.ruoyi.basicData.mapper;
 
-import com.ruoyi.orderManagement.BasicData.domain.FleetDriverMsg;
+import com.ruoyi.basicData.domain.FleetDriverMsg;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/IFleetCarManageService.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetCarManageService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.orderManagement.BasicData.service;
+package com.ruoyi.basicData.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.orderManagement.BasicData.domain.FleetCarManage;
+import com.ruoyi.basicData.domain.FleetCarManage;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/IFleetCompanyMsgService.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetCompanyMsgService.java

@@ -1,8 +1,8 @@
-package com.ruoyi.orderManagement.BasicData.service;
+package com.ruoyi.basicData.service;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
+import com.ruoyi.basicData.domain.FleetCompanyMsg;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/IFleetDriverMsgService.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetDriverMsgService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.orderManagement.BasicData.service;
+package com.ruoyi.basicData.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.orderManagement.BasicData.domain.FleetDriverMsg;
+import com.ruoyi.basicData.domain.FleetDriverMsg;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/impl/FleetCarManageServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCarManageServiceImpl.java

@@ -1,19 +1,18 @@
-package com.ruoyi.orderManagement.BasicData.service.impl;
+package com.ruoyi.basicData.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.basicData.domain.FleetCarManage;
+import com.ruoyi.basicData.domain.FleetCompanyMsg;
+import com.ruoyi.basicData.mapper.FleetCarManageMapper;
+import com.ruoyi.basicData.mapper.FleetCompanyMsgMapper;
+import com.ruoyi.basicData.service.IFleetCarManageService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.orderManagement.BasicData.domain.FleetCarManage;
-import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
-import com.ruoyi.orderManagement.BasicData.service.IFleetCarManageService;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsattachs;
-import com.ruoyi.orderManagement.BasicData.mapper.FleetCarManageMapper;
-import com.ruoyi.orderManagement.BasicData.mapper.FleetCompanyMsgMapper;
-import com.ruoyi.orderManagement.mapper.FtmsorderbillsattachsMapper;
-import com.ruoyi.warehouseBusiness.mapper.TEnclosureMapper;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsattachs;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsattachsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/impl/FleetCompanyMsgServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCompanyMsgServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ruoyi.orderManagement.BasicData.service.impl;
+package com.ruoyi.basicData.service.impl;
 
 
+import com.ruoyi.basicData.domain.FleetCompanyMsg;
+import com.ruoyi.basicData.mapper.FleetCompanyMsgMapper;
+import com.ruoyi.basicData.service.IFleetCompanyMsgService;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
-import com.ruoyi.orderManagement.BasicData.service.IFleetCompanyMsgService;
-import com.ruoyi.orderManagement.BasicData.mapper.FleetCompanyMsgMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/impl/FleetDriverMsgServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ruoyi.orderManagement.BasicData.service.impl;
+package com.ruoyi.basicData.service.impl;
 
+import com.ruoyi.basicData.domain.FleetDriverMsg;
+import com.ruoyi.basicData.mapper.FleetDriverMsgMapper;
+import com.ruoyi.basicData.service.IFleetDriverMsgService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.orderManagement.BasicData.domain.FleetDriverMsg;
-import com.ruoyi.orderManagement.BasicData.mapper.FleetDriverMsgMapper;
-import com.ruoyi.orderManagement.BasicData.service.IFleetDriverMsgService;
 import com.ruoyi.system.domain.SysUserPost;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.SysUserMapper;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/Ftmsorderbills.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbills.java

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.domain;
+package com.ruoyi.orderPlan.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -6,8 +6,6 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/Ftmsorderbillsattachs.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbillsattachs.java

@@ -1,8 +1,6 @@
-package com.ruoyi.orderManagement.domain;
+package com.ruoyi.orderPlan.domain;
 
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/Ftmsorderbillscars.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbillscars.java

@@ -1,12 +1,10 @@
-package com.ruoyi.orderManagement.domain;
+package com.ruoyi.orderPlan.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/Ftmsorderbillscntrs.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbillscntrs.java

@@ -1,10 +1,8 @@
-package com.ruoyi.orderManagement.domain;
+package com.ruoyi.orderPlan.domain;
 
 import java.math.BigDecimal;
 
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/Ftmsorderbillsplans.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbillsplans.java

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.domain;
+package com.ruoyi.orderPlan.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/ProjectBillsHistory.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/ProjectBillsHistory.java

@@ -1,10 +1,8 @@
-package com.ruoyi.orderManagement.domain;
+package com.ruoyi.orderPlan.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/mapper/FtmsorderbillsMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillsMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.orderManagement.mapper;
+package com.ruoyi.orderPlan.mapper;
 
-import com.ruoyi.orderManagement.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/mapper/FtmsorderbillsattachsMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillsattachsMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.orderManagement.mapper;
+package com.ruoyi.orderPlan.mapper;
 
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsattachs;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsattachs;
 
 import java.util.List;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/mapper/FtmsorderbillscarsMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillscarsMapper.java

@@ -1,9 +1,8 @@
-package com.ruoyi.orderManagement.mapper;
+package com.ruoyi.orderPlan.mapper;
 
-import com.ruoyi.orderManagement.domain.Ftmsorderbills;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscars;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscntrs;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsplans;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscntrs;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/mapper/FtmsorderbillscntrsMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillscntrsMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.orderManagement.mapper;
+package com.ruoyi.orderPlan.mapper;
 
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscntrs;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsplans;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscntrs;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsplans;
 
 import java.util.List;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/mapper/FtmsorderbillsplansMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillsplansMapper.java

@@ -1,8 +1,7 @@
-package com.ruoyi.orderManagement.mapper;
+package com.ruoyi.orderPlan.mapper;
 
-import com.ruoyi.orderManagement.domain.Ftmsorderbills;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscars;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsplans;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsplans;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/mapper/ProjectBillsHistoryMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/ProjectBillsHistoryMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.orderManagement.mapper;
+package com.ruoyi.orderPlan.mapper;
 
-import com.ruoyi.orderManagement.domain.ProjectBillsHistory;
+import com.ruoyi.orderPlan.domain.ProjectBillsHistory;
 
 import java.util.List;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/IProjectBillsHistoryService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IProjectBillsHistoryService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.orderManagement.service;
+package com.ruoyi.orderPlan.service;
 
-import com.ruoyi.orderManagement.domain.ProjectBillsHistory;
+import com.ruoyi.orderPlan.domain.ProjectBillsHistory;
 
 import java.util.List;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/IftmsorderbillsService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillsService.java

@@ -1,8 +1,8 @@
-package com.ruoyi.orderManagement.service;
+package com.ruoyi.orderPlan.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.orderManagement.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/IftmsorderbillsattachsService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillsattachsService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.orderManagement.service;
+package com.ruoyi.orderPlan.service;
 
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsattachs;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsattachs;
 
 import java.util.List;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/IftmsorderbillscarsService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillscarsService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.orderManagement.service;
+package com.ruoyi.orderPlan.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.orderManagement.domain.Ftmsorderbills;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscars;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/IftmsorderbillscntrsService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillscntrsService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.orderManagement.service;
+package com.ruoyi.orderPlan.service;
 
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscntrs;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscntrs;
 
 import java.util.List;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/IftmsorderbillsplansService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillsplansService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.orderManagement.service;
+package com.ruoyi.orderPlan.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.orderManagement.domain.Ftmsorderbills;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsplans;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsplans;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/FtmsorderbillsServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.service.impl;
+package com.ruoyi.orderPlan.service.impl;
 
 import java.util.*;
 
@@ -9,11 +9,11 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.orderManagement.domain.*;
-import com.ruoyi.orderManagement.mapper.*;
-import com.ruoyi.orderManagement.service.IftmsorderbillsService;
-import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
-import com.ruoyi.orderManagement.statusTracking.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.orderPlan.domain.*;
+import com.ruoyi.orderPlan.mapper.*;
+import com.ruoyi.orderPlan.service.IftmsorderbillsService;
+import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -79,7 +79,7 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         map.put("attach", ftmsorderbillsattachsMapper.selectftmsorderbillsattachsList(ftmsorderbillsattachs));
         // 查询费用明细
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFPid(id);
+        ftmsorderbillsfees.setfPid(id);
         ftmsorderbillsfees.setActId(billType);
         map.put("fees", ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees));
         return map;
@@ -139,10 +139,10 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
             JSONArray feesJson = JSONArray.parseArray(fees);
             List<Ftmsorderbillsfees> tmsorderbillsfeesList = JSONObject.parseArray(feesJson.toJSONString(), Ftmsorderbillsfees.class);
             for (Ftmsorderbillsfees f : tmsorderbillsfeesList) {
-                f.setFPid(pId);
+                f.setfPid(pId);
                 f.setOrgId(pId);
                 f.setActId(1000L);
-                f.setFStatus(itemstatus);
+                f.setfStatus(itemstatus);
                 f.setCreateTime(new Date());
                 f.setCreateBy(loginUser.getUsername());
                 if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(f) <= 0) {
@@ -475,11 +475,11 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
             int line = 0;
             for (Ftmsorderbillsfees f : tmsorderbillsfeesList) {
                 line++;
-                if (StringUtils.isNull(f.getFCorpid())) {
+                if (StringUtils.isNull(f.getfCorpid())) {
                     return "费用信息第" + line + "行未找到结算单位数据，若多次失败请联系管理员";
-                } else if (StringUtils.isNull(f.getFFeeid())) {
+                } else if (StringUtils.isNull(f.getfFeeid())) {
                     return "费用信息第" + line + "行未找到费用数据，若多次失败请联系管理员";
-                } else if (StringUtils.isNull(f.getFFeeunitid())) {
+                } else if (StringUtils.isNull(f.getfFeeunitid())) {
                     return "费用信息第" + line + "行未找到计费单位数据，若多次失败请联系管理员";
                 }
             }
@@ -557,11 +557,11 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         //  判断费用是否符合
         if (StringUtils.isNotEmpty(fees) && !"{}".equals(fees)) {
             Ftmsorderbillsfees f = JSONArray.parseObject(fees, Ftmsorderbillsfees.class);
-            if (StringUtils.isNull(f.getFCorpid())) {
+            if (StringUtils.isNull(f.getfCorpid())) {
                 return "费用信息未找到结算单位数据，若多次失败请联系管理员";
-            } else if (StringUtils.isNull(f.getFFeeid())) {
+            } else if (StringUtils.isNull(f.getfFeeid())) {
                 return "费用信息行未找到费用数据，若多次失败请联系管理员";
-            } else if (StringUtils.isNull(f.getFFeeunitid())) {
+            } else if (StringUtils.isNull(f.getfFeeunitid())) {
                 return "费用信息未找到计费单位数据，若多次失败请联系管理员";
             }
         }

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/FtmsorderbillsattachsServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsattachsServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.orderManagement.service.impl;
+package com.ruoyi.orderPlan.service.impl;
 
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsattachs;
-import com.ruoyi.orderManagement.mapper.FtmsorderbillsattachsMapper;
-import com.ruoyi.orderManagement.service.IftmsorderbillsattachsService;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsattachs;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsattachsMapper;
+import com.ruoyi.orderPlan.service.IftmsorderbillsattachsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.service.impl;
+package com.ruoyi.orderPlan.service.impl;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -17,19 +17,18 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.finance.mapper.TFeeDoMapper;
 import com.ruoyi.framework.web.service.WechatService;
-import com.ruoyi.orderManagement.domain.*;
-import com.ruoyi.orderManagement.mapper.*;
+import com.ruoyi.orderPlan.domain.*;
+import com.ruoyi.orderPlan.mapper.*;
+import com.ruoyi.system.mapper.SysUserMapper;
 import lombok.extern.slf4j.Slf4j;
-import com.ruoyi.orderManagement.service.IftmsorderbillscarsService;
-import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
-import com.ruoyi.orderManagement.statusTracking.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.orderPlan.service.IftmsorderbillscarsService;
+import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import javax.validation.constraints.Size;
-
 /**
  * 车队派车Service业务层处理
  *
@@ -101,7 +100,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         map.put("attachs", ftmsorderbillsattachsMapper.selectftmsorderbillsattachsList(ftmsorderbillsattachs));
         // 查询费用信息
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFPid(id);
+        ftmsorderbillsfees.setfPid(id);
         ftmsorderbillsfees.setActId(1020L);
         map.put("fees", ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees));
         return map;
@@ -141,7 +140,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         Long id = ftmsorderbillscars.getId();
         map.put("cars", ftmsorderbillscarsMapper.selectTmsorderbillsCarsByDriver(id));
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFPid(id);
+        ftmsorderbillsfees.setfPid(id);
         ftmsorderbillsfees.setActId(ftmsorderbillscars.getBillStatus());
         map.put("fees", ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees));
         Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
@@ -224,7 +223,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             return AjaxResult.error("更新司机状态失败，若多次失败请联系管理员");
         }
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFPid(pId);
+        ftmsorderbillsfees.setfPid(pId);
         ftmsorderbillsfees.setActId(orderStatus);
         ftmsorderbillsfeesMapper.deleteFTmsorderbillsfees(ftmsorderbillsfees);
         Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
@@ -237,11 +236,11 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             long line = 0;
             for (Ftmsorderbillsfees f : ftmsorderbillsfeesList) {
                 line++;
-                f.setFPid(pId);
+                f.setfPid(pId);
                 f.setOrgId(orgId);
-                f.setFLineno(line);
+                f.setfLineno(line);
                 f.setActId(orderStatus);
-                f.setFStatus(2L);
+                f.setfStatus(2L);
                 f.setCreateTime(new Date());
                 f.setCreateBy(loginUser.getUsername());
                 if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(f) <= 0) {
@@ -323,7 +322,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             }
             tmsorderbillscars.setOrderStatus(30L);
         } else if ("offData".equals(operationType)) {
-            // 提箱提交
+            // 出行提交
             orderStatus = 1080L;
             if (StringUtils.isNull(tmsorderbillscars.getLoadDate())) {
                 return AjaxResult.error("未找到出车时间");
@@ -342,7 +341,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             return AjaxResult.error("更新司机状态失败，若多次失败请联系管理员");
         }
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFId(pId);
+        ftmsorderbillsfees.setfId(pId);
         ftmsorderbillsfees.setActId(orderStatus);
         ftmsorderbillsfeesMapper.deleteFTmsorderbillsfees(ftmsorderbillsfees);
         Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
@@ -355,10 +354,10 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             long line = 0;
             for (Ftmsorderbillsfees f : ftmsorderbillsfeesList) {
                 line++;
-                f.setFPid(pId);
-                f.setFStatus(6L);
+                f.setfPid(pId);
+                f.setfStatus(6L);
                 f.setOrgId(orgId);
-                f.setFLineno(line);
+                f.setfLineno(line);
                 f.setActId(orderStatus);
                 f.setCreateTime(new Date());
                 f.setCreateBy(loginUser.getUsername());
@@ -428,7 +427,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         long pId = tmsorderbills.getId();
         ftmsorderbillscarsMapper.deleteftmsorderbillscarsByPId(tmsorderbillsplans.getId());
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFPid(tmsorderbillsplans.getId());
+        ftmsorderbillsfees.setfPid(tmsorderbillsplans.getId());
         ftmsorderbillsfees.setActId(1020L);
         ftmsorderbillsfeesMapper.deleteFTmsorderbillsfees(ftmsorderbillsfees);
         Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
@@ -469,6 +468,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
                 s.setOrgId(pId);
                 s.setBillStatus(6L);
                 s.setCreateTime(new Date());
+                s.setMblno(tmsorderbills.getMblno());
                 s.setCreateBy(loginUser.getUsername());
                 if (ftmsorderbillscarsMapper.insertftmsorderbillscars(s) <= 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -488,10 +488,10 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             JSONArray feesJson = JSONArray.parseArray(fees);
             List<Ftmsorderbillsfees> tmsorderbillsfeesList = JSONObject.parseArray(feesJson.toJSONString(), Ftmsorderbillsfees.class);
             for (Ftmsorderbillsfees a : tmsorderbillsfeesList) {
-                a.setFPid(tmsorderbillsplans.getId());
+                a.setfPid(tmsorderbillsplans.getId());
                 a.setOrgId(pId);
                 a.setActId(1020L);
-                a.setFBillstatus(billsStatus);
+                a.setfBillstatus(billsStatus);
                 a.setCreateTime(new Date());
                 a.setCreateBy(loginUser.getUsername());
                 if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(a) <= 0) {
@@ -672,7 +672,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             return AjaxResult.error("更新调度数据失败，若多次失败请联系管理员");
         }
         Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
-        Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(ftmsorderbillsplans.getId());
+        Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(ftmsorderbillsplans.getPId());
         // 应收运价
         ftmsorderbillscars.setFreightPriceDr(ftmsorderbillscntrs.getPriceDr());
         // 应付运价
@@ -694,18 +694,16 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             return AjaxResult.error("更新车辆安排数据失败，若多次失败请联系管理员");
         }
         SysUser sysUser = sysUserMapper.selectUserByTel(ftmsorderbillscars.getDriverTel());
-        if (StringUtils.isNull(sysUser)) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("未找到司机信息，请确认是否存在该司机");
-        }
-        String openId = sysUser.getOpenId();
-        String nickName = sysUser.getNickName();
-        String mblno = ftmsorderbillscars.getMblno();
-        String loadDate = DateUtils.dateTime(tmsorderbills.getLoadDate());
-        // 获得客户名
-        TCorps corps = tCorpsMapper.selectTCorpsById(tmsorderbills.getCorpId());
-        wechatService.newsPush(openId, nickName, mblno, amtDr + "", corps.getfName(), loadDate, "其他消息暂定", "备注暂定");
-        return AjaxResult.success();
+        if (StringUtils.isNotNull(sysUser)) {
+            String openId = sysUser.getOpenId();
+            String nickName = sysUser.getNickName();
+            String mblno = ftmsorderbillscars.getMblno();
+            String loadDate = DateUtils.dateTime(tmsorderbills.getLoadDate());
+            // 获得客户名
+            TCorps corps = tCorpsMapper.selectTCorpsById(tmsorderbills.getCorpId());
+            wechatService.newsPush(openId, nickName, mblno, amtDr + "", corps.getfName(), loadDate, "其他消息暂定", "备注暂定");
+        }
+        return AjaxResult.success(ftmsorderbillscars);
     }
 
     /**
@@ -719,7 +717,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         List<Ftmsorderbillsfees> ftmsorderbillsfeesList = ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesByPId(ftmsorderbillscars.getId());
         if (ftmsorderbillsfeesList.size() != 0) {
             for (Ftmsorderbillsfees f : ftmsorderbillsfeesList) {
-                if (StringUtils.isNotEmpty(f.getFStlamountNo())) {
+                if (StringUtils.isNotEmpty(f.getfStlamountNo())) {
                     return AjaxResult.error("该安排车辆费用已经结算，无法撤销");
                 }
             }

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/FtmsorderbillscntrsServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillscntrsServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.orderManagement.service.impl;
+package com.ruoyi.orderPlan.service.impl;
 
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscntrs;
-import com.ruoyi.orderManagement.mapper.FtmsorderbillscntrsMapper;
-import com.ruoyi.orderManagement.service.IftmsorderbillscntrsService;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscntrs;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillscntrsMapper;
+import com.ruoyi.orderPlan.service.IftmsorderbillscntrsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/FtmsorderbillsplansServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsplansServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.service.impl;
+package com.ruoyi.orderPlan.service.impl;
 
 import java.util.*;
 
@@ -9,9 +9,11 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.orderManagement.domain.*;
-import com.ruoyi.orderManagement.mapper.*;
-import com.ruoyi.orderManagement.service.IftmsorderbillsplansService;
+import com.ruoyi.orderPlan.domain.*;
+import com.ruoyi.orderPlan.mapper.*;
+import com.ruoyi.orderPlan.service.IftmsorderbillsplansService;
+import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -88,8 +90,8 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         ftmsorderbillsattachs.setActId(1010L);
         map.put("attach", ftmsorderbillsattachsMapper.selectftmsorderbillsattachsList(ftmsorderbillsattachs));
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFPid(ftmsorderbills.getId());
-        ftmsorderbillsfees.setFPid(1010L);
+        ftmsorderbillsfees.setfPid(ftmsorderbills.getId());
+        ftmsorderbillsfees.setActId(1010L);
         map.put("fees", ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees));
         return AjaxResult.success(map);
     }
@@ -226,6 +228,9 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         // 计划数据
         Ftmsorderbills tmsorderbills = JSONArray.parseObject(tmsorder, Ftmsorderbills.class);
         long pId = tmsorderbills.getId();
+        tmsorderbills.setPlanUserId(loginUser.getUser().getUserId());
+        tmsorderbills.setPlanUserName(loginUser.getUser().getNickName());
+        ftmsorderbillsMapper.updateftmsorderbills(tmsorderbills);
         String status = ftmsorderbillsService.objValidation(null, null, null, plans, null);
         if (StringUtils.isNotEmpty(status)) {
             return AjaxResult.error(status);
@@ -292,7 +297,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         tmsorderbills.setUpdateBy(loginUser.getUsername());
         ftmsorderbillsMapper.updateftmsorderbills(tmsorderbills);
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFPid(pId);
+        ftmsorderbillsfees.setfPid(pId);
         ftmsorderbillsfees.setActId(1010L);
         ftmsorderbillsfeesMapper.deleteFTmsorderbillsfees(ftmsorderbillsfees);
         Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
@@ -425,7 +430,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         ftmsorderbillsMapper.updateftmsorderbills(tmsorderbills);
         long pId = tmsorderbills.getId();
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFPid(pId);
+        ftmsorderbillsfees.setfPid(pId);
         ftmsorderbillsfees.setActId(1010L);
         ftmsorderbillsfeesMapper.deleteFTmsorderbillsfees(ftmsorderbillsfees);
         Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
@@ -461,22 +466,22 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             int line = 0;
             for (Ftmsorderbillsfees f : tmsorderbillsfeesList) {
                 line++;
-                if (StringUtils.isNull(f.getFCorpid()) || f.getFCorpid() == 0) {
+                if (StringUtils.isNull(f.getfCorpid()) || f.getfCorpid() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("费用数据第" + line + "行缺少客户数据");
                 }
-                if (StringUtils.isNull(f.getFFeeid()) || f.getFFeeid() == 0) {
+                if (StringUtils.isNull(f.getfFeeid()) || f.getfFeeid() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("费用数据第" + line + "行缺少费用数据");
                 }
-                if (StringUtils.isNull(f.getFFeeunitid()) || f.getFFeeunitid() == 0) {
+                if (StringUtils.isNull(f.getfFeeunitid()) || f.getfFeeunitid() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("费用数据第" + line + "行缺少计价单位");
                 }
-                f.setFPid(pId);
+                f.setfPid(pId);
                 f.setOrgId(pId);
                 f.setActId(1010L);
-                f.setFStatus(2L);
+                f.setfStatus(2L);
                 f.setCreateBy(loginUser.getUsername());
                 f.setCreateTime(new Date());
                 if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(f) <= 0) {
@@ -528,7 +533,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         ftmsorderbillsMapper.updateftmsorderbills(tmsorderbills);
         long pId = tmsorderbills.getId();
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFPid(pId);
+        ftmsorderbillsfees.setfPid(pId);
         ftmsorderbillsfees.setActId(1010L);
         ftmsorderbillsfeesMapper.deleteFTmsorderbillsfees(ftmsorderbillsfees);
         Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
@@ -563,22 +568,22 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             int line = 0;
             for (Ftmsorderbillsfees f : tmsorderbillsfeesList) {
                 line++;
-                if (StringUtils.isNull(f.getFCorpid()) || f.getFCorpid() == 0) {
+                if (StringUtils.isNull(f.getfCorpid()) || f.getfCorpid() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("费用数据第" + line + "行缺少客户数据");
                 }
-                if (StringUtils.isNull(f.getFFeeid()) || f.getFFeeid() == 0) {
+                if (StringUtils.isNull(f.getfFeeid()) || f.getfFeeid() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("费用数据第" + line + "行缺少费用数据");
                 }
-                if (StringUtils.isNull(f.getFFeeunitid()) || f.getFFeeunitid() == 0) {
+                if (StringUtils.isNull(f.getfFeeunitid()) || f.getfFeeunitid() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("费用数据第" + line + "行缺少计价单位");
                 }
-                f.setFPid(pId);
+                f.setfPid(pId);
                 f.setOrgId(pId);
                 f.setActId(1010L);
-                f.setFStatus(6L);
+                f.setfStatus(6L);
                 f.setCreateBy(loginUser.getUsername());
                 f.setCreateTime(new Date());
                 if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(f) <= 0) {

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/ProjectBillsHistoryServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/ProjectBillsHistoryServiceImpl.java

@@ -1,10 +1,10 @@
-package com.ruoyi.orderManagement.service.impl;
+package com.ruoyi.orderPlan.service.impl;
 
 import java.util.List;
 
-import com.ruoyi.orderManagement.domain.ProjectBillsHistory;
-import com.ruoyi.orderManagement.mapper.ProjectBillsHistoryMapper;
-import com.ruoyi.orderManagement.service.IProjectBillsHistoryService;
+import com.ruoyi.orderPlan.domain.ProjectBillsHistory;
+import com.ruoyi.orderPlan.mapper.ProjectBillsHistoryMapper;
+import com.ruoyi.orderPlan.service.IProjectBillsHistoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/statusTracking/domain/Ftmsorderbillsfees.java → ruoyi-fleet/src/main/java/com/ruoyi/statusTracking/domain/Ftmsorderbillsfees.java

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.statusTracking.domain;
+package com.ruoyi.statusTracking.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -6,7 +6,6 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
-import lombok.Data;
 
 /**
  * 订单费用对象 F_TMSORDERBILLSFEES

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/statusTracking/mapper/FtmsorderbillsfeesMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/statusTracking/mapper/FtmsorderbillsfeesMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.orderManagement.statusTracking.mapper;
+package com.ruoyi.statusTracking.mapper;
 
-import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
 
 import java.util.List;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/statusTracking/service/IftmsorderbillsfeesService.java → ruoyi-fleet/src/main/java/com/ruoyi/statusTracking/service/IftmsorderbillsfeesService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.orderManagement.statusTracking.service;
+package com.ruoyi.statusTracking.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/statusTracking/service/impl/FtmsorderbillsfeesServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/statusTracking/service/impl/FtmsorderbillsfeesServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.statusTracking.service.impl;
+package com.ruoyi.statusTracking.service.impl;
 
 import java.util.*;
 
@@ -13,22 +13,18 @@ import com.ruoyi.basicData.mapper.TGoodsMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
-import com.ruoyi.orderManagement.domain.Ftmsorderbills;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsattachs;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillscars;
-import com.ruoyi.orderManagement.mapper.FtmsorderbillsMapper;
-import com.ruoyi.orderManagement.mapper.FtmsorderbillscarsMapper;
-import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
-import com.ruoyi.orderManagement.statusTracking.mapper.FtmsorderbillsfeesMapper;
-import com.ruoyi.orderManagement.statusTracking.service.IftmsorderbillsfeesService;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsMapper;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillscarsMapper;
+import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.statusTracking.service.IftmsorderbillsfeesService;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-fleet/src/main/resources/mapper/basicData/FleetCarManageMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.BasicData.mapper.FleetCarManageMapper">
+<mapper namespace="com.ruoyi.basicData.mapper.FleetCarManageMapper">
     
     <resultMap type="FleetCarManage" id="FleetCarManageResult">
         <result property="id"    column="id"    />

ruoyi-fleet/src/main/resources/mapper/basicData/FleetCompanyMsgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.BasicData.mapper.FleetCompanyMsgMapper">
+<mapper namespace="com.ruoyi.basicData.mapper.FleetCompanyMsgMapper">
     
     <resultMap type="FleetCompanyMsg" id="FleetCompanyMsgResult">
         <result property="id"    column="id"    />

ruoyi-fleet/src/main/resources/mapper/basicData/FleetDriverMsgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.BasicData.mapper.FleetDriverMsgMapper">
+<mapper namespace="com.ruoyi.basicData.mapper.FleetDriverMsgMapper">
     
     <resultMap type="FleetDriverMsg" id="FleetDriverMsgResult">
         <result property="id"    column="id"    />

ruoyi-fleet/src/main/resources/mapper/ProjectBillsHistoryMapper.xml → ruoyi-fleet/src/main/resources/mapper/orderPlan/ProjectBillsHistoryMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.mapper.ProjectBillsHistoryMapper">
+<mapper namespace="com.ruoyi.orderPlan.mapper.ProjectBillsHistoryMapper">
 
     <resultMap type="ProjectBillsHistory" id="ProjectBillsHistoryResult">
         <result property="id" column="id"/>

ruoyi-fleet/src/main/resources/mapper/ftmsorderbillsMapper.xml → ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.mapper.FtmsorderbillsMapper">
+<mapper namespace="com.ruoyi.orderPlan.mapper.FtmsorderbillsMapper">
 
     <resultMap type="ftmsorderbills" id="ftmsorderbillsResult">
         <result property="id" column="id"/>

ruoyi-fleet/src/main/resources/mapper/ftmsorderbillsattachsMapper.xml → ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillsattachsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.mapper.FtmsorderbillsattachsMapper">
+<mapper namespace="com.ruoyi.orderPlan.mapper.FtmsorderbillsattachsMapper">
 
     <resultMap type="ftmsorderbillsattachs" id="ftmsorderbillsattachsResult">
         <result property="id" column="id"/>

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.mapper.FtmsorderbillscarsMapper">
+<mapper namespace="com.ruoyi.orderPlan.mapper.FtmsorderbillscarsMapper">
 
     <resultMap type="ftmsorderbillscars" id="ftmsorderbillscarsResult">
         <result property="id" column="id"/>
@@ -465,7 +465,13 @@
             c.org_id AS orgId,
             t.corp_id AS fCorpId,
             corp.f_name AS fCorpIds,
+            u.nick_name AS planUserId,
+            t.un_load_date AS tUnLoadDate,
             t.un_load_addr AS unLoadAddr,
+            t.un_load_attn AS unLoadAttn,
+            t.un_load_attn_tel AS unLoadAttnTel,
+            t.qty_plan AS qtyPlan,
+            t.weight_plan AS weightPlan,
             t.bill_type AS billType,
             t.trans_type AS transType,
             t.trans_prop AS transProp,
@@ -483,6 +489,8 @@
             t.pol_id AS polId,
             t.pod_id AS podId,
             c.cntr_id AS cntrId,
+            c.driver_tel AS driverTel,
+            c.driver_name AS driverName,
             c.carreg_no AS carregNo,
             c.carcor_pid AS carcorPid,
             c.driver_tel AS driverTel,
@@ -502,6 +510,7 @@
         FROM
             F_TMSORDERBILLSCARS c
             LEFT JOIN F_TMSORDERBILLS t ON t.id = c.org_id
+            LEFT JOIN sys_user u ON u.user_id = t.plan_user_id
             LEFT JOIN t_corps corp ON corp.f_id = t.corp_id
             LEFT JOIN t_goods g ON g.f_id = t.goods_id
         where

ruoyi-fleet/src/main/resources/mapper/ftmsorderbillscntrsMapper.xml → ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscntrsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.mapper.FtmsorderbillscntrsMapper">
+<mapper namespace="com.ruoyi.orderPlan.mapper.FtmsorderbillscntrsMapper">
 
     <resultMap type="ftmsorderbillscntrs" id="ftmsorderbillscntrsResult">
         <result property="id" column="id"/>

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.mapper.FtmsorderbillsplansMapper">
+<mapper namespace="com.ruoyi.orderPlan.mapper.FtmsorderbillsplansMapper">
 
     <resultMap type="ftmsorderbillsplans" id="ftmsorderbillsplansResult">
         <result property="id" column="id"/>
@@ -66,9 +66,9 @@
             c.f_name AS corpId,
             p.nick_name AS planUserId,
             a.nick_name AS transUserId,
-            f.bill_type AS billType,
-            f.trans_type AS transType,
-            f.trans_prop AS transProp,
+            type.dict_label AS billType,
+            trans.dict_label AS transType,
+            prop.dict_label AS transProp,
             f.if_contracted AS ifContracted,
             f.contract_no AS contractNo,
             f.accstl_type AS accstlType,
@@ -90,13 +90,19 @@
         FROM
             F_TMSORDERBILLSPLANS plan
             LEFT JOIN F_TMSORDERBILLS f ON f.id = plan.org_id
+            LEFT JOIN sys_dict_data type ON type.dict_type = 'data_billType'
+            AND type.dict_value = f.bill_type
+            LEFT JOIN sys_dict_data trans ON trans.dict_type = 'data_transType'
+            AND trans.dict_value = f.trans_type
+            LEFT JOIN sys_dict_data prop ON prop.dict_type = 'data_transProp'
+            AND prop.dict_value = f.trans_prop
             LEFT JOIN t_corps c ON c.f_id = f.corp_id
             LEFT JOIN sys_user p ON p.user_id = f.plan_user_id
             LEFT JOIN sys_user a ON a.user_id = f.trans_user_id
             LEFT JOIN t_goods g ON g.f_id = f.goods_id
             LEFT JOIN sys_user u ON u.user_name = f.create_by
         WHERE
-            f.id != ''
+            f.id != ''·
             <if test="corpId != null and corpId != ''">
                 AND f.corp_id = #{corpId}
             </if>

ruoyi-fleet/src/main/resources/mapper/statusTracking/ftmsorderbillsfeesMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.statusTracking.mapper.FtmsorderbillsfeesMapper">
+<mapper namespace="com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper">
 
     <resultMap type="FTmsorderbillsfees" id="FTmsorderbillsfeesResult">
         <result property="fId" column="f_id"/>