Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCorpsMapper.java
#	ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITCorpsService.java
#	ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java
#	ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java
#	ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java
#	ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

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

@@ -60,8 +60,7 @@ public class FleetCompanyMsgController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TCorps tCorps)
     {
-        String typeValue = "[\"4\"]";
-        tCorps.setfTypeid(typeValue);
+        tCorps.setfTypeid("100");
         List<TCorps> list = tCorpsService.selectTCorpsList(tCorps);
         return getDataTable(list);
     }
@@ -73,8 +72,7 @@ public class FleetCompanyMsgController extends BaseController
     @GetMapping("/query")
     public TableDataInfo query(TCorps tCorps)
     {
-        String typeValue = "[\"4\"]";
-        tCorps.setfTypeid(typeValue);
+        tCorps.setfTypeid("100");
         startPage();
         List<TCorps> list = tCorpsService.selectTCorpsList(tCorps);
         return getDataTable(list);

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

@@ -52,8 +52,7 @@ public class FleetDriverMsgController extends BaseController
     @GetMapping("/list")
     public List<TCorps> list(TCorps tCorps)
     {
-        String typeValue = "[\"6\"]";
-        tCorps.setfTypeid(typeValue);
+        tCorps.setfTypeid("102");
         return tCorpsService.selectTCorpsList(tCorps);
     }
 
@@ -64,7 +63,7 @@ public class FleetDriverMsgController extends BaseController
     @GetMapping(value = "/query")
     public TableDataInfo query(TCorps tCorps)
     {
-        String typeValue = "[\"6\"]";
+        String typeValue = "[\"102\"]";
         tCorps.setfTypeid(typeValue);
         startPage();
         List<Map<String, Object>> list = tCorpsService.selectFleetDriverMsgListMap(tCorps);

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

@@ -41,7 +41,7 @@ public class FTmsaccbillsController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(FTmsaccbills fTmsaccbills)
     {
-        fTmsaccbills.setFBilltype("SFDZ");
+        fTmsaccbills.setfBilltype("SFDZ");
         startPage();
         List<Map<String, Object>> list = fTmsaccbillsService.selectFTmsaccbillsMapList(fTmsaccbills);
         return getDataTable(list);

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

@@ -41,7 +41,7 @@ public class TChargesController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(FTmsaccbills fTmsaccbills)
     {
-        fTmsaccbills.setFBilltype("JSSF");
+        fTmsaccbills.setfBilltype("JSSF");
         startPage();
         List<Map<String, Object>> list = fTmsaccbillsService.selectFTmsaccbillsMapList(fTmsaccbills);
         return getDataTable(list);

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

@@ -41,7 +41,7 @@ public class TPaymentsController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(FTmsaccbills fTmsaccbills)
     {
-        fTmsaccbills.setFBilltype("JSFF");
+        fTmsaccbills.setfBilltype("JSFF");
         startPage();
         List<Map<String, Object>> list = fTmsaccbillsService.selectFTmsaccbillsMapList(fTmsaccbills);
         return getDataTable(list);

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

@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
+import com.ruoyi.orderPlan.domain.FtmsorderbillscarsExcel;
 import com.ruoyi.orderPlan.service.IftmsorderbillscarsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -55,8 +56,9 @@ public class ftmsorderbillscarsController extends BaseController {
     @GetMapping("/query")
     public Map<String, Object> query(Ftmsorderbills ftmsorderbills) {
         Map<String, Object> map = new HashMap<>();
+        Ftmsorderbills tmsorder = ftmsorderbillscarsService.judgmentFleet(ftmsorderbills);
         startPage();
-        List<Map<String, Object>> list = ftmsorderbillscarsService.selectftmsorderbillscarsMapList(ftmsorderbills);
+        List<FtmsorderbillscarsExcel> list = ftmsorderbillscarsService.selectftmsorderbillscarsMapList(tmsorder);
         map.put("dataTable", getDataTable(list));
         map.put("buttonValue", ftmsorderbillscarsService.getButtonValue());
         return map;
@@ -81,10 +83,11 @@ public class ftmsorderbillscarsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:export')")
     @Log(title = "车队派车", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(Ftmsorderbillscars ftmsorderbillscars) {
-        List<Ftmsorderbillscars> list = ftmsorderbillscarsService.selectftmsorderbillscarsList(ftmsorderbillscars);
-        ExcelUtil<Ftmsorderbillscars> util = new ExcelUtil<Ftmsorderbillscars>(Ftmsorderbillscars.class);
-        return util.exportExcel(list, "ftmsorderbillscars");
+    public AjaxResult export(Ftmsorderbills ftmsorderbills) {
+        Ftmsorderbills tmsorder = ftmsorderbillscarsService.judgmentFleet(ftmsorderbills);
+        List<FtmsorderbillscarsExcel> list = ftmsorderbillscarsService.selectftmsorderbillscarsMapList(tmsorder);
+        ExcelUtil<FtmsorderbillscarsExcel> util = new ExcelUtil<FtmsorderbillscarsExcel>(FtmsorderbillscarsExcel.class);
+        return util.exportExcel(list, "状态跟踪");
     }
 
     /**

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

@@ -1,15 +1,11 @@
-package com.ruoyi.web.controller.fleet.statusTracking;
+package com.ruoyi.web.controller.fleet.orderPlan;
 
 import com.ruoyi.common.annotation.Log;
 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.enums.BusinessType;
-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.statusTracking.service.IftmsorderbillsfeesService;
+import com.ruoyi.orderPlan.service.IftmsorderbillsfeesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

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

@@ -59,7 +59,7 @@ public class ftmsorderbillsplansController extends BaseController {
     /**
      * 查询车队派车列表
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsplans:query')")
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:query')")
     @GetMapping("/query")
     public TableDataInfo query(Ftmsorderbills ftmsorderbills) {
         startPage();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TCorpsController.java

@@ -45,6 +45,22 @@ public class TCorpsController extends BaseController {
     }
 
     /**
+     * 车队使用，查询客户、司机信息
+     */
+    @GetMapping(value = "/selectCustomerDriverList")
+    public List<TCorps> selectCustomerDriverList (TCorps tCorps) {
+        return tCorpsService.selectCustomerDriverList(tCorps);
+    }
+
+    /**
+     * 车队使用，查询客户、司机信息
+     */
+    @GetMapping(value = "/selectCorpList/{fId}")
+    public List<TCorps> selectCorpList (@PathVariable("fId") Long fId) {
+        return tCorpsService.selectCorpList(fId);
+    }
+
+    /**
      * 导出客户详情列表
      */
     @PreAuthorize("@ss.hasPermi('basicdata:corps:export')")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseGoodsTransferController.java

@@ -18,6 +18,7 @@ import com.ruoyi.warehouseBusiness.excel.GoodsTransfer;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -93,7 +94,8 @@ public class TWarehouseGoodsTransferController extends BaseController {
                           @RequestParam("tEnclosure") String tWhgenleg,
                           @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
-                          @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
+                          @RequestParam("warehousebillsitems") String tWarehousebillsitems,
+                          @RequestParam("mblnoStatus") String mblnoStatus) {
         String billsType = "HQZY";
         if (StringUtils.isEmpty(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("提交失败：请检查主表数据");
@@ -101,6 +103,14 @@ public class TWarehouseGoodsTransferController extends BaseController {
         if (StringUtils.isEmpty(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
             return AjaxResult.error("提交失败：请检查库存明细数据");
         }
+        if (StringUtils.isEmpty(mblnoStatus)) {
+            // 判断是提单号是否在一天当中出现第二次或以上
+            AjaxResult result = itWarehouseBillsService.selectContainMblno(tWarehouseBills, billsType);
+            String ajaxCode = result.get("code").toString();
+            if ("500".equals(ajaxCode)) {
+                return result;
+            }
+        }
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -18,6 +18,7 @@ import com.ruoyi.warehouseBusiness.excel.InStock;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -93,11 +94,20 @@ public class TWarehouseInStockController extends BaseController {
                           @RequestParam("tEnclosure") String tEnclosure,
                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
-                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
+                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems,
+                          @RequestParam("mblnoStatus") String mblnoStatus) {
         String billsType = "SJRK";
         if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据，请确认");
         }
+        if (StringUtils.isEmpty(mblnoStatus)) {
+            // 判断是提单号是否在一天当中出现第二次或以上
+            AjaxResult result = itWarehouseBillsService.selectContainMblno(tWarehouseBills, billsType);
+            String data = result.get("data").toString();
+            if (StringUtils.isNotEmpty(data) && "false".equals(data)) {
+                return result;
+            }
+        }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,
                 tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseOutStockController.java

@@ -18,6 +18,7 @@ import com.ruoyi.warehouseBusiness.excel.OutStock;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -118,11 +119,20 @@ public class TWarehouseOutStockController extends BaseController {
                           @RequestParam("tEnclosure") String tEnclosure,
                           @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
-                          @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
+                          @RequestParam("warehousebillsitems") String tWarehousebillsitems,
+                          @RequestParam("mblnoStatus") String mblnoStatus) {
         String billsType = "SJCK";
         if (StringUtils.isEmpty(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("提交失败：请检查主表数据");
         }
+        if (StringUtils.isEmpty(mblnoStatus)) {
+            // 判断是提单号是否在一天当中出现第二次或以上
+            AjaxResult result = itWarehouseBillsService.selectContainMblno(tWarehouseBills, billsType);
+            String ajaxCode = result.get("code").toString();
+            if ("500".equals(ajaxCode)) {
+                return result;
+            }
+        }
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseStockTransferController.java

@@ -18,6 +18,7 @@ import com.ruoyi.warehouseBusiness.excel.StockTransfer;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -105,7 +106,8 @@ public class TWarehouseStockTransferController extends BaseController {
                           @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                           @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                           @RequestParam("warehousebillsitems") String warehousebillsitems,
-                          @RequestParam("type") String type) {
+                          @RequestParam("type") String type,
+                          @RequestParam("mblnoStatus") String mblnoStatus) {
         String billsType =null;
         if(type.equals("1")){
              billsType = "CKDB";
@@ -115,6 +117,14 @@ public class TWarehouseStockTransferController extends BaseController {
         if (StringUtils.isNull(warehouseBills) || "{}".equals(warehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据，请确认");
         }
+        if (StringUtils.isEmpty(mblnoStatus)) {
+            // 判断是提单号是否在一天当中出现第二次或以上
+            AjaxResult result = itWarehouseBillsService.selectContainMblno(warehouseBills, billsType);
+            String ajaxCode = result.get("code").toString();
+            if ("500".equals(ajaxCode)) {
+                return result;
+            }
+        }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(warehouseBills, warehousebillsfeesCr,
                 warehousebillsfeesDr, warehousebillsitems, tEnclosure, loginUser, billsType);

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -214,6 +214,30 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     }
 
     /**
+     *  获取当天开始与结束日期
+     * @return
+     */
+    public static List<String> getSpecifyDay(Date date)
+    {
+        List<String> stringList = new ArrayList<>();
+        SimpleDateFormat format = new SimpleDateFormat(YYYY_MM_DD_HH_MM_SS);
+        String firstday, lastday;
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        Date dete1 = new Date(calendar.getTimeInMillis());//得到指定日期的开始时间
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
+        calendar.set(Calendar.MILLISECOND, 999);
+        Date dete2 = new Date(calendar.getTimeInMillis());//得到指定日期的结束时间
+        firstday = format.format(dete1.getTime());
+        stringList.add(firstday);
+        lastday = format.format(dete2.getTime());
+        stringList.add(lastday);
+        return  stringList;
+    }
+
+    /**
      *  获取当前月份第一天与最后一天
      * @return
      */

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

@@ -2,6 +2,7 @@ package com.ruoyi.basicData.mapper;
 
 
 import com.ruoyi.basicData.domain.FleetCarManage;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 
 import java.util.List;
 import java.util.Map;
@@ -77,4 +78,18 @@ public interface FleetCarManageMapper
      * @return  结果
      */
     public int selectFleetCarManageCount(FleetCarManage fleetCarManage);
+
+    /**
+     *  根据司机id更新车辆手机号、姓名
+     * @param fleetCarManage    参数
+     * @return  结果
+     */
+    public int updateFleetCarManageByDriverId(FleetCarManage fleetCarManage);
+
+    /**
+     *  查询可用车辆，若是车队，则查询符合车队的可用车辆
+     * @param ftmsorderbills    参数
+     * @return  结果
+     */
+    public int selectManageCount(Ftmsorderbills ftmsorderbills);
 }

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

@@ -101,9 +101,10 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     @Override
     @Transactional
     public AjaxResult insertFleetCompanyMsg(TCorps tCorps) {
-        String typeValue = "[\"4\"]";
+        String typeValue = "[\"100\"]";
         tCorps.setfTypeid(typeValue);
-        tCorps.setfStatus("1");
+        tCorps.setfTypename("车队");
+        tCorps.setfStatus("0");
         if (StringUtils.isNotNull(tCorps.getfId())) {
             tCorps.setUpdateBy(SecurityUtils.getUsername());
             tCorps.setUpdateTime(new Date());
@@ -114,6 +115,7 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("未找到用户信息，请添加后再提交");
             }
+            sysUser.setUserType("22");
             sysUser.setUserSystem("2");
             sysUser.setUpdateTime(new Date());
             sysUser.setPhonenumber(tCorps.getfTel());
@@ -139,8 +141,7 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     public AjaxResult createUser(TCorps tCorps) {
         // 创建用户
         SysUser user = new SysUser();
-        user.setStatus("1");
-        user.setUserType("00");
+        user.setUserType("22");
         user.setUserSystem("2");
         user.setCreateTime(new Date());
         user.setNickName(tCorps.getfTel());

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

@@ -1,7 +1,9 @@
 package com.ruoyi.basicData.service.impl;
 
+import com.ruoyi.basicData.domain.FleetCarManage;
 import com.ruoyi.basicData.domain.FleetDriverMsg;
 import com.ruoyi.basicData.domain.TCorps;
+import com.ruoyi.basicData.mapper.FleetCarManageMapper;
 import com.ruoyi.basicData.mapper.FleetDriverMsgMapper;
 import com.ruoyi.basicData.mapper.TCorpsMapper;
 import com.ruoyi.basicData.service.IFleetDriverMsgService;
@@ -41,15 +43,9 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
     private TCorpsMapper corpsMapper;
 
     @Autowired
-    private FleetDriverMsgMapper fleetDriverMsgMapper;
-
-    @Autowired
     private SysRoleMapper roleMapper;
 
     @Autowired
-    private FtmsorderbillscarsMapper ftmsorderbillscarsMapper;
-
-    @Autowired
     private SysUserMapper userMapper;
 
     @Autowired
@@ -58,6 +54,15 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
     @Autowired
     private SysUserRoleMapper userRoleMapper;
 
+    @Autowired
+    private FleetDriverMsgMapper fleetDriverMsgMapper;
+
+    @Autowired
+    private FleetCarManageMapper fleetCarManageMapper;
+
+    @Autowired
+    private FtmsorderbillscarsMapper ftmsorderbillscarsMapper;
+
     /**
      * 查询【司机】
      *
@@ -100,35 +105,42 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("请填写必输项");
         }
-        String typeValue = "[\"6\"]";
+        String typeValue = "[\"102\"]";
         tCorps.setfTypeid(typeValue);
-        tCorps.setfStatus("1");
+        tCorps.setfTypename("司机");
+        tCorps.setfStatus("0");
         if (null != tCorps.getfId()) {
-            updateDriverPhone(tCorps);
+//            updateDriverPhone(tCorps);
+            AjaxResult result = this.updateFleetCarManagePhone(tCorps);
+            String ajaxCode = result.get("code").toString();
+            if ("500".equals(ajaxCode)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return result;
+            }
             tCorps.setUpdateTime(new Date());
             tCorps.setUpdateBy(SecurityUtils.getUsername());
             corpsMapper.updateTCorps(tCorps);
             return AjaxResult.success();
         } else {
             SysUser sysUser = new SysUser();
+            sysUser.setUserName(tCorps.getfTel());
             sysUser.setPhonenumber(tCorps.getfTel());
-            sysUser.setUserName(tCorps.getLoginAccount());
             SysUser userPhone = userMapper.checkPhoneUnique(sysUser.getPhonenumber());
-            if (userMapper.checkUserNameUnique(sysUser.getUserName()) > 1) {
-                return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，登录账号已存在");
-            } else if (StringUtils.isNotNull(userPhone) && "T".equals(userPhone.getRelatedNo())) {
+            if (StringUtils.isNotNull(userPhone) && "T".equals(userPhone.getRelatedNo())) {
                 return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，手机号码已存在");
+            } else if (userMapper.checkUserNameUnique(sysUser.getUserName()) > 1) {
+                return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，登录账号已存在");
             }
             long userId = 0L;
             // 查询是否有用户提前关注小程序
             SysUser user = userMapper.selectUserByTel(tCorps.getfTel());
             if (StringUtils.isNotNull(user)) {
                 // 该用户提前关注小程序了
+                user.setStatus("1");
                 user.setRelatedNo("T");
                 user.setUserSystem("2");
-                user.setNickName(tCorps.getfName());
                 user.setUpdateTime(new Date());
-                user.setStatus("1");
+                user.setNickName(tCorps.getfName());
                 user.setUpdateBy(SecurityUtils.getUsername());
                 user.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
                 userMapper.updateUser(user);
@@ -136,8 +148,8 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             } else {
                 // 添加用户表
                 SysUser use = new SysUser();
-                use.setUserSystem("2");
                 use.setStatus("1");
+                use.setUserSystem("2");
                 use.setUserName(tCorps.getfTel());
                 use.setNickName(tCorps.getfTel());
                 use.setPhonenumber(tCorps.getfTel());
@@ -194,6 +206,59 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
         ftmsorderbillscarsMapper.updateftmsorderbillscarsDriverNamePhone();
     }
 
+    @Transactional
+    public AjaxResult updateFleetCarManagePhone(TCorps tCorps) {
+        TCorps corps = corpsMapper.selectTCorpsById(tCorps.getfId());
+        SysUser sysUser = userMapper.selectUserByTel(corps.getfTel());
+        if (StringUtils.isNotNull(sysUser)) {
+            SysUser user = new SysUser();
+            // 跟新用户手机号以及姓名
+            sysUser.setNickName(tCorps.getfName());
+            if (!sysUser.getPhonenumber().equals(tCorps.getfTel())) {
+                user.setUserSystem("2");
+                user.setStatus("1");
+                user.setUserType("11");
+                user.setUserName(tCorps.getfTel());
+                user.setNickName(tCorps.getfName());
+                user.setPhonenumber(tCorps.getfTel());
+                user.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
+                user.setCreateTime(new Date());
+                user.setCreateBy(SecurityUtils.getUsername());
+                userMapper.insertUser(user);
+                // 查询是否存在车队 角色
+                SysRole role = roleMapper.selectRoleByName("司机");
+                if (StringUtils.isNull(role)) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("未找到司机角色，请创建司机角色后提交");
+                }
+                // 创建用户与角色关联
+                List<SysUserRole> list = new ArrayList<SysUserRole>();
+                SysUserRole sysUserRole = new SysUserRole();
+                sysUserRole.setRoleId(role.getRoleId());
+                sysUserRole.setUserId(user.getUserId());
+                list.add(sysUserRole);
+                userRoleMapper.batchUserRole(list);
+            }
+            sysUser.setUpdateTime(new Date());
+            sysUser.setUpdateBy(SecurityUtils.getUsername());
+            userMapper.updateUser(sysUser);
+        }
+        //  变更还柜状态
+        Ftmsorderbillscars ftmsorderbillscars = new Ftmsorderbillscars();
+        ftmsorderbillscars.setDriverTel(tCorps.getfTel());
+        ftmsorderbillscars.setDriverUserId(tCorps.getfId());
+        ftmsorderbillscars.setDriverName(tCorps.getfName());
+        ftmsorderbillscarsMapper.updateftmsorderbillscarTel(ftmsorderbillscars);
+        //  变更车辆数据
+        FleetCarManage fleetCarManage = new FleetCarManage();
+        fleetCarManage.setDriverId(tCorps.getfId());
+        fleetCarManage.setDriverTel(tCorps.getfTel());
+        fleetCarManage.setDriverName(tCorps.getfName());
+        fleetCarManageMapper.updateFleetCarManageByDriverId(fleetCarManage);
+        return AjaxResult.success();
+    }
+
+
     /**
      * 修改【司机】
      *

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/domain/FTmsaccbills.java

@@ -18,7 +18,6 @@ import java.util.List;
  * @author ruoyi
  * @date 2021-03-12
  */
-@Data
 public class FTmsaccbills extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -220,10 +219,262 @@ public class FTmsaccbills extends BaseEntity {
      * 查询时间区间
      */
     private List<String> timeInterval;
-    public void settimeInterval(List<String> timeInterval) {
-        this.timeInterval = timeInterval;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getAccYear() {
+        return accYear;
+    }
+
+    public void setAccYear(Long accYear) {
+        this.accYear = accYear;
+    }
+
+    public Long getAccMonth() {
+        return accMonth;
+    }
+
+    public void setAccMonth(Long accMonth) {
+        this.accMonth = accMonth;
+    }
+
+    public Long getActId() {
+        return actId;
+    }
+
+    public void setActId(Long actId) {
+        this.actId = actId;
+    }
+
+    public Date getfFromDate() {
+        return fFromDate;
+    }
+
+    public void setfFromDate(Date fFromDate) {
+        this.fFromDate = fFromDate;
+    }
+
+    public BigDecimal getAmt() {
+        return amt;
+    }
+
+    public void setAmt(BigDecimal amt) {
+        this.amt = amt;
+    }
+
+    public Date getfToDate() {
+        return fToDate;
+    }
+
+    public void setfToDate(Date fToDate) {
+        this.fToDate = fToDate;
+    }
+
+    public String getRefNo() {
+        return refNo;
+    }
+
+    public void setRefNo(String refNo) {
+        this.refNo = refNo;
+    }
+
+    public Date getPostDate() {
+        return postDate;
+    }
+
+    public void setPostDate(Date postDate) {
+        this.postDate = postDate;
+    }
+
+    public BigDecimal getfAmtcr() {
+        return fAmtcr;
+    }
+
+    public void setfAmtcr(BigDecimal fAmtcr) {
+        this.fAmtcr = fAmtcr;
+    }
+
+    public BigDecimal getfAmtdr() {
+        return fAmtdr;
+    }
+
+    public void setfAmtdr(BigDecimal fAmtdr) {
+        this.fAmtdr = fAmtdr;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getfCtrlcorpid() {
+        return fCtrlcorpid;
+    }
+
+    public void setfCtrlcorpid(String fCtrlcorpid) {
+        this.fCtrlcorpid = fCtrlcorpid;
+    }
+
+    public String gettMblno() {
+        return tMblno;
+    }
+
+    public void settMblno(String tMblno) {
+        this.tMblno = tMblno;
+    }
+
+    public String getfBilltype() {
+        return fBilltype;
+    }
+
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
+    }
+
+    public Date getfAccbilldate() {
+        return fAccbilldate;
+    }
+
+    public void setfAccbilldate(Date fAccbilldate) {
+        this.fAccbilldate = fAccbilldate;
+    }
+
+    public String getfRefNo() {
+        return fRefNo;
+    }
+
+    public void setfRefNo(String fRefNo) {
+        this.fRefNo = fRefNo;
+    }
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
+
+    public Long getfDeptid() {
+        return fDeptid;
+    }
+
+    public void setfDeptid(Long fDeptid) {
+        this.fDeptid = fDeptid;
+    }
+
+    public String getChargingMethod() {
+        return chargingMethod;
+    }
+
+    public void setChargingMethod(String chargingMethod) {
+        this.chargingMethod = chargingMethod;
+    }
+
+    public Long getfBillstatus() {
+        return fBillstatus;
+    }
+
+    public void setfBillstatus(Long fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
     }
-    public List<String> gettimeInterval() {
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public String getBank() {
+        return bank;
+    }
+
+    public void setBank(String bank) {
+        this.bank = bank;
+    }
+
+    public String getWaterBillNo() {
+        return waterBillNo;
+    }
+
+    public void setWaterBillNo(String waterBillNo) {
+        this.waterBillNo = waterBillNo;
+    }
+
+    public Long getfCorpid() {
+        return fCorpid;
+    }
+
+    public void setfCorpid(Long fCorpid) {
+        this.fCorpid = fCorpid;
+    }
+
+    public String getfSystemType() {
+        return fSystemType;
+    }
+
+    public void setfSystemType(String fSystemType) {
+        this.fSystemType = fSystemType;
+    }
+
+    public String getfRemarks() {
+        return fRemarks;
+    }
+
+    public void setfRemarks(String fRemarks) {
+        this.fRemarks = fRemarks;
+    }
+
+    public List<String> getTimeInterval() {
         return timeInterval;
     }
+
+    public void setTimeInterval(List<String> timeInterval) {
+        this.timeInterval = timeInterval;
+    }
+
+    @Override
+    public String toString() {
+        return "FTmsaccbills{" +
+                "id=" + id +
+                ", accYear=" + accYear +
+                ", accMonth=" + accMonth +
+                ", actId=" + actId +
+                ", fFromDate=" + fFromDate +
+                ", amt=" + amt +
+                ", fToDate=" + fToDate +
+                ", refNo='" + refNo + '\'' +
+                ", postDate=" + postDate +
+                ", fAmtcr=" + fAmtcr +
+                ", fAmtdr=" + fAmtdr +
+                ", delFlag='" + delFlag + '\'' +
+                ", fCtrlcorpid='" + fCtrlcorpid + '\'' +
+                ", tMblno='" + tMblno + '\'' +
+                ", fBilltype='" + fBilltype + '\'' +
+                ", fAccbilldate=" + fAccbilldate +
+                ", fRefNo='" + fRefNo + '\'' +
+                ", fBillno='" + fBillno + '\'' +
+                ", fDeptid=" + fDeptid +
+                ", chargingMethod='" + chargingMethod + '\'' +
+                ", fBillstatus=" + fBillstatus +
+                ", invoiceNo='" + invoiceNo + '\'' +
+                ", bank='" + bank + '\'' +
+                ", waterBillNo='" + waterBillNo + '\'' +
+                ", fCorpid=" + fCorpid +
+                ", fSystemType='" + fSystemType + '\'' +
+                ", fRemarks='" + fRemarks + '\'' +
+                ", timeInterval=" + timeInterval +
+                '}';
+    }
 }

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/impl/FTmsaccbillsServiceImpl.java

@@ -9,7 +9,6 @@ import com.ruoyi.basicData.mapper.TFeesMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.orderManagement.finance.domain.FTmsaccbills;
@@ -21,8 +20,8 @@ import com.ruoyi.orderManagement.finance.service.IFTmsaccbillsService;
 import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 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.orderPlan.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.warehouseBusiness.domain.BillnoDel;
 import com.ruoyi.warehouseBusiness.mapper.BillnoDelMapper;
@@ -81,8 +80,8 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
         // 费用
         List<Long> feesId = new ArrayList<>();
         FTmsaccbills fTmsaccbills = fTmsaccbillsMapper.selectFTmsaccbillsById(fId);
-        if (StringUtils.isNotNull(fTmsaccbills.getFCorpid())) {
-            corpsId.add(fTmsaccbills.getFCorpid());
+        if (StringUtils.isNotNull(fTmsaccbills.getfCorpid())) {
+            corpsId.add(fTmsaccbills.getfCorpid());
         }
         // 查询从表数据
         FTmsaccbillsitems fTmsaccbillsitems = new FTmsaccbillsitems();
@@ -213,16 +212,16 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
             if (StringUtils.isNotEmpty(billnoDels)) {
                 // 如果有数据在删除列表
                 billnoDelMapper.deleteBillnoDelById(billnoDels.get(0).getId());
-                fTmsaccbills.setFBillno(billnoDels.get(0).getBillNo());
+                fTmsaccbills.setfBillno(billnoDels.get(0).getBillNo());
             } else {
                 // 生成流水号
                 Date time = new Date();
                 String billNo = billnoSerialServiceImpl.getBillNo(fBilltype, time);
-                fTmsaccbills.setFBillno(billNo);
+                fTmsaccbills.setfBillno(billNo);
             }
-            fTmsaccbills.setFBillstatus(2L);
-            fTmsaccbills.setFBilltype(fBilltype);
-            fTmsaccbills.setFDeptid(SecurityUtils.getLoginUser().getUser().getDeptId());
+            fTmsaccbills.setfBillstatus(2L);
+            fTmsaccbills.setfBilltype(fBilltype);
+            fTmsaccbills.setfDeptid(SecurityUtils.getLoginUser().getUser().getDeptId());
             fTmsaccbillsMapper.insertFTmsaccbills(fTmsaccbills);
             fPid = fTmsaccbills.getId();
         } else {
@@ -268,7 +267,7 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
     @Transactional
     public AjaxResult confirm(String tfee, String tfeeDo, LoginUser loginUser, String fBilltype) {
         FTmsaccbills fTmsaccbills = JSONArray.parseObject(tfee, FTmsaccbills.class);
-        fTmsaccbills.setFBillstatus(4L);
+        fTmsaccbills.setfBillstatus(4L);
         if (StringUtils.isNull(fTmsaccbills.getId())) {
             // 如果是新数据
             // 业务编码
@@ -278,16 +277,16 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
             if (StringUtils.isNotEmpty(billnoDels)) {
                 // 如果有数据在删除列表
                 billnoDelMapper.deleteBillnoDelById(billnoDels.get(0).getId());
-                fTmsaccbills.setFBillno(billnoDels.get(0).getBillNo());
+                fTmsaccbills.setfBillno(billnoDels.get(0).getBillNo());
             } else {
                 // 生成流水号
                 Date time = new Date();
                 String billNo = billnoSerialServiceImpl.getBillNo(fBilltype, time);
-                fTmsaccbills.setFBillno(billNo);
+                fTmsaccbills.setfBillno(billNo);
             }
-            fTmsaccbills.setFBilltype(fBilltype);
+            fTmsaccbills.setfBilltype(fBilltype);
             fTmsaccbills.setCreateTime(new Date());
-            fTmsaccbills.setFDeptid(loginUser.getUser().getDeptId());
+            fTmsaccbills.setfDeptid(loginUser.getUser().getDeptId());
             fTmsaccbills.setCreateBy(loginUser.getUser().getUserName());
             fTmsaccbillsMapper.insertFTmsaccbills(fTmsaccbills);
         } else {
@@ -341,7 +340,7 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
         }
         FTmsaccbills tFee = new FTmsaccbills();
         tFee.setId(fPid);
-        tFee.setFBillstatus(fettle);
+        tFee.setfBillstatus(fettle);
         int tFeeUpdateResult = fTmsaccbillsMapper.updateFTmsaccbills(tFee);
         if (tFeeUpdateResult <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

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

@@ -256,6 +256,11 @@ public class Ftmsorderbills extends BaseEntity {
      */
     private List<String> cLoadDate;
 
+    /**
+     * 查询派车数量的时间区间
+     */
+    private List<String> currentDay;
+
     public String getIsFleet() {
         return isFleet;
     }
@@ -734,6 +739,14 @@ public class Ftmsorderbills extends BaseEntity {
         this.cLoadDate = cLoadDate;
     }
 
+    public List<String> getcurrentDay() {
+        return currentDay;
+    }
+
+    public void setcurrentDay(List<String> currentDay) {
+        this.currentDay = currentDay;
+    }
+
     @Override
     public String toString() {
         return "Ftmsorderbills{" +
@@ -794,6 +807,7 @@ public class Ftmsorderbills extends BaseEntity {
                 ", invoiceType='" + invoiceType + '\'' +
                 ", planDate=" + planDate +
                 ", cLoadDate=" + cLoadDate +
+                ", currentDay=" + currentDay +
                 ", isFleet=" + isFleet +
                 '}';
     }

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

@@ -344,8 +344,8 @@ public class Ftmsorderbillscars extends BaseEntity {
     @Excel(name = "状态(1新建，2暂存，6提交)")
     private Long billStatus;
 
-    /** 订单状态0新录入10车队安排20司机受理30提箱40装卸货50还卸柜子60费用确认70回单 */
-    @Excel(name = "订单状态0新录入10车队安排20司机受理30提箱40装卸货50还卸柜子60费用确认70回单")
+    /** 订单状态0新录入10车队安排20司机受理30提箱40装卸货50还卸柜60费用确认70回单 */
+    @Excel(name = "订单状态0新录入10车队安排20司机受理30提箱40装卸货50还卸柜60费用确认70回单")
     private Long orderStatus;
 
     /** 对账日期 */

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/FtmsorderbillscarsExcel.java

@@ -0,0 +1,633 @@
+package com.ruoyi.orderPlan.domain;
+
+import com.ruoyi.common.annotation.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class FtmsorderbillscarsExcel {
+    private Long id;
+
+    @Excel(name = "运单号")
+    private String orderNo;
+
+    @Excel(name = "提单号")
+    private String mblno;
+
+    @Excel(name = "车号")
+    private String carregNo;
+
+    @Excel(name = "司机")
+    private String driverName;
+
+    @Excel(name = "司机电话")
+    private String driverTel;
+
+    @Excel(name = "状态")
+    private String orderName;
+
+    private String orderStatus;
+
+    @Excel(name = "托运人")
+    private String corpId;
+
+    @Excel(name = "贸易方式")
+    private String billType;
+
+    @Excel(name = "运输方式")
+    private String transType;
+
+    @Excel(name = "运输性质")
+    private String transProp;
+
+    @Excel(name = "品名")
+    private String goodsId;
+
+    @Excel(name = "重量")
+    private String cntrWeight;
+
+    private String qtyPlan;
+
+    private String weightPlan;
+
+    @Excel(name = "船名")
+    private String ysl;
+
+    @Excel(name = "航次")
+    private String voy;
+
+    @Excel(name = "提箱场站")
+    private String loadAddr;
+
+    private Date tLoadDate;
+
+    private String loadAttn;
+
+    private String loadAttntel;
+
+    @Excel(name = "装货地")
+    private String mdLoadAddr;
+
+    private Date tMdLoadDate;
+
+    private String mdLoadAttn;
+
+    private String mdLoadAttnTel;
+
+    @Excel(name = "卸货地")
+    private String unLoadAddr;
+
+    private String tUnLoadDate;
+
+    private String unLoadAttn;
+
+    private String unLoadAttnTel;
+
+    @Excel(name = "柜型")
+    private String cntrId;
+
+    @Excel(name = "起运港")
+    private String polId;
+
+    @Excel(name = "目的港")
+    private String podId;
+
+    @Excel(name = "接单日期")
+    private Date acceptDate;
+
+    @Excel(name = "柜量")
+    private Long cntrQty;
+
+    private Date offData;
+
+    @Excel(name = "提箱日期")
+    private Date loadDate;
+
+    @Excel(name = "装卸日期")
+    private Date mdLoadDate;
+
+    @Excel(name = "还柜日期")
+    private Date unLoadDate;
+
+    private Date waybillDate;
+
+    private String waybillRemarks;
+
+    @Excel(name = "油气费")
+    private BigDecimal oilAmt;
+
+    @Excel(name = "其他费用")
+    private BigDecimal costOth;
+
+    @Excel(name = "单趟提成")
+    private BigDecimal driverbonus;
+
+    @Excel(name = "备注")
+    private String costRemarks;
+
+    @Excel(name = "提箱费")
+    private BigDecimal costomAmt06;
+
+    @Excel(name = "港杂费")
+    private BigDecimal costomAmt05;
+
+    @Excel(name = "吊装费")
+    private BigDecimal costomAmt04;
+
+    @Excel(name = "修洗费")
+    private BigDecimal costomAmt03;
+
+    @Excel(name = "进口其他费用")
+    private BigDecimal costomAmt02;
+
+    @Excel(name = "出口其他费用")
+    private BigDecimal costomAmt01;
+
+    @Excel(name = "进口费用备注")
+    private BigDecimal costomStr02;
+
+    @Excel(name = "出口费用备注")
+    private BigDecimal costomStr01;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getMblno() {
+        return mblno;
+    }
+
+    public void setMblno(String mblno) {
+        this.mblno = mblno;
+    }
+
+    public String getCarregNo() {
+        return carregNo;
+    }
+
+    public void setCarregNo(String carregNo) {
+        this.carregNo = carregNo;
+    }
+
+    public String getDriverName() {
+        return driverName;
+    }
+
+    public void setDriverName(String driverName) {
+        this.driverName = driverName;
+    }
+
+    public String getDriverTel() {
+        return driverTel;
+    }
+
+    public void setDriverTel(String driverTel) {
+        this.driverTel = driverTel;
+    }
+
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getCorpId() {
+        return corpId;
+    }
+
+    public void setCorpId(String corpId) {
+        this.corpId = corpId;
+    }
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType;
+    }
+
+    public String getTransType() {
+        return transType;
+    }
+
+    public void setTransType(String transType) {
+        this.transType = transType;
+    }
+
+    public String getTransProp() {
+        return transProp;
+    }
+
+    public void setTransProp(String transProp) {
+        this.transProp = transProp;
+    }
+
+    public String getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(String goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public String getCntrWeight() {
+        return cntrWeight;
+    }
+
+    public void setCntrWeight(String cntrWeight) {
+        this.cntrWeight = cntrWeight;
+    }
+
+    public String getQtyPlan() {
+        return qtyPlan;
+    }
+
+    public void setQtyPlan(String qtyPlan) {
+        this.qtyPlan = qtyPlan;
+    }
+
+    public String getWeightPlan() {
+        return weightPlan;
+    }
+
+    public void setWeightPlan(String weightPlan) {
+        this.weightPlan = weightPlan;
+    }
+
+    public String getYsl() {
+        return ysl;
+    }
+
+    public void setYsl(String ysl) {
+        this.ysl = ysl;
+    }
+
+    public String getVoy() {
+        return voy;
+    }
+
+    public void setVoy(String voy) {
+        this.voy = voy;
+    }
+
+    public String getLoadAddr() {
+        return loadAddr;
+    }
+
+    public void setLoadAddr(String loadAddr) {
+        this.loadAddr = loadAddr;
+    }
+
+    public Date gettLoadDate() {
+        return tLoadDate;
+    }
+
+    public void settLoadDate(Date tLoadDate) {
+        this.tLoadDate = tLoadDate;
+    }
+
+    public String getLoadAttn() {
+        return loadAttn;
+    }
+
+    public void setLoadAttn(String loadAttn) {
+        this.loadAttn = loadAttn;
+    }
+
+    public String getLoadAttntel() {
+        return loadAttntel;
+    }
+
+    public void setLoadAttntel(String loadAttntel) {
+        this.loadAttntel = loadAttntel;
+    }
+
+    public String getMdLoadAddr() {
+        return mdLoadAddr;
+    }
+
+    public void setMdLoadAddr(String mdLoadAddr) {
+        this.mdLoadAddr = mdLoadAddr;
+    }
+
+    public Date gettMdLoadDate() {
+        return tMdLoadDate;
+    }
+
+    public void settMdLoadDate(Date tMdLoadDate) {
+        this.tMdLoadDate = tMdLoadDate;
+    }
+
+    public String getMdLoadAttn() {
+        return mdLoadAttn;
+    }
+
+    public void setMdLoadAttn(String mdLoadAttn) {
+        this.mdLoadAttn = mdLoadAttn;
+    }
+
+    public String getMdLoadAttnTel() {
+        return mdLoadAttnTel;
+    }
+
+    public void setMdLoadAttnTel(String mdLoadAttnTel) {
+        this.mdLoadAttnTel = mdLoadAttnTel;
+    }
+
+    public String getUnLoadAddr() {
+        return unLoadAddr;
+    }
+
+    public void setUnLoadAddr(String unLoadAddr) {
+        this.unLoadAddr = unLoadAddr;
+    }
+
+    public String gettUnLoadDate() {
+        return tUnLoadDate;
+    }
+
+    public void settUnLoadDate(String tUnLoadDate) {
+        this.tUnLoadDate = tUnLoadDate;
+    }
+
+    public String getUnLoadAttn() {
+        return unLoadAttn;
+    }
+
+    public void setUnLoadAttn(String unLoadAttn) {
+        this.unLoadAttn = unLoadAttn;
+    }
+
+    public String getUnLoadAttnTel() {
+        return unLoadAttnTel;
+    }
+
+    public void setUnLoadAttnTel(String unLoadAttnTel) {
+        this.unLoadAttnTel = unLoadAttnTel;
+    }
+
+    public String getCntrId() {
+        return cntrId;
+    }
+
+    public void setCntrId(String cntrId) {
+        this.cntrId = cntrId;
+    }
+
+    public String getPolId() {
+        return polId;
+    }
+
+    public void setPolId(String polId) {
+        this.polId = polId;
+    }
+
+    public String getPodId() {
+        return podId;
+    }
+
+    public void setPodId(String podId) {
+        this.podId = podId;
+    }
+
+    public Date getAcceptDate() {
+        return acceptDate;
+    }
+
+    public void setAcceptDate(Date acceptDate) {
+        this.acceptDate = acceptDate;
+    }
+
+    public Long getCntrQty() {
+        return cntrQty;
+    }
+
+    public void setCntrQty(Long cntrQty) {
+        this.cntrQty = cntrQty;
+    }
+
+    public Date getOffData() {
+        return offData;
+    }
+
+    public void setOffData(Date offData) {
+        this.offData = offData;
+    }
+
+    public Date getLoadDate() {
+        return loadDate;
+    }
+
+    public void setLoadDate(Date loadDate) {
+        this.loadDate = loadDate;
+    }
+
+    public Date getMdLoadDate() {
+        return mdLoadDate;
+    }
+
+    public void setMdLoadDate(Date mdLoadDate) {
+        this.mdLoadDate = mdLoadDate;
+    }
+
+    public Date getUnLoadDate() {
+        return unLoadDate;
+    }
+
+    public void setUnLoadDate(Date unLoadDate) {
+        this.unLoadDate = unLoadDate;
+    }
+
+    public Date getWaybillDate() {
+        return waybillDate;
+    }
+
+    public void setWaybillDate(Date waybillDate) {
+        this.waybillDate = waybillDate;
+    }
+
+    public String getWaybillRemarks() {
+        return waybillRemarks;
+    }
+
+    public void setWaybillRemarks(String waybillRemarks) {
+        this.waybillRemarks = waybillRemarks;
+    }
+
+    public BigDecimal getOilAmt() {
+        return oilAmt;
+    }
+
+    public void setOilAmt(BigDecimal oilAmt) {
+        this.oilAmt = oilAmt;
+    }
+
+    public BigDecimal getCostOth() {
+        return costOth;
+    }
+
+    public void setCostOth(BigDecimal costOth) {
+        this.costOth = costOth;
+    }
+
+    public BigDecimal getDriverbonus() {
+        return driverbonus;
+    }
+
+    public void setDriverbonus(BigDecimal driverbonus) {
+        this.driverbonus = driverbonus;
+    }
+
+    public String getCostRemarks() {
+        return costRemarks;
+    }
+
+    public void setCostRemarks(String costRemarks) {
+        this.costRemarks = costRemarks;
+    }
+
+    public BigDecimal getCostomAmt06() {
+        return costomAmt06;
+    }
+
+    public void setCostomAmt06(BigDecimal costomAmt06) {
+        this.costomAmt06 = costomAmt06;
+    }
+
+    public BigDecimal getCostomAmt05() {
+        return costomAmt05;
+    }
+
+    public void setCostomAmt05(BigDecimal costomAmt05) {
+        this.costomAmt05 = costomAmt05;
+    }
+
+    public BigDecimal getCostomAmt04() {
+        return costomAmt04;
+    }
+
+    public void setCostomAmt04(BigDecimal costomAmt04) {
+        this.costomAmt04 = costomAmt04;
+    }
+
+    public BigDecimal getCostomAmt03() {
+        return costomAmt03;
+    }
+
+    public void setCostomAmt03(BigDecimal costomAmt03) {
+        this.costomAmt03 = costomAmt03;
+    }
+
+    public BigDecimal getCostomAmt02() {
+        return costomAmt02;
+    }
+
+    public void setCostomAmt02(BigDecimal costomAmt02) {
+        this.costomAmt02 = costomAmt02;
+    }
+
+    public BigDecimal getCostomAmt01() {
+        return costomAmt01;
+    }
+
+    public void setCostomAmt01(BigDecimal costomAmt01) {
+        this.costomAmt01 = costomAmt01;
+    }
+
+    public BigDecimal getCostomStr02() {
+        return costomStr02;
+    }
+
+    public void setCostomStr02(BigDecimal costomStr02) {
+        this.costomStr02 = costomStr02;
+    }
+
+    public BigDecimal getCostomStr01() {
+        return costomStr01;
+    }
+
+    public void setCostomStr01(BigDecimal costomStr01) {
+        this.costomStr01 = costomStr01;
+    }
+
+    @Override
+    public String toString() {
+        return "FtmsorderbillscarsExcel{" +
+                "orderNo='" + orderNo + '\'' +
+                ", mblno='" + mblno + '\'' +
+                ", carregNo='" + carregNo + '\'' +
+                ", driverName='" + driverName + '\'' +
+                ", driverTel='" + driverTel + '\'' +
+                ", orderName='" + orderName + '\'' +
+                ", orderStatus='" + orderStatus + '\'' +
+                ", corpId='" + corpId + '\'' +
+                ", billType='" + billType + '\'' +
+                ", transType='" + transType + '\'' +
+                ", transProp='" + transProp + '\'' +
+                ", goodsId='" + goodsId + '\'' +
+                ", cntrWeight='" + cntrWeight + '\'' +
+                ", qtyPlan='" + qtyPlan + '\'' +
+                ", weightPlan='" + weightPlan + '\'' +
+                ", ysl='" + ysl + '\'' +
+                ", voy='" + voy + '\'' +
+                ", loadAddr='" + loadAddr + '\'' +
+                ", tLoadDate='" + tLoadDate + '\'' +
+                ", loadAttn='" + loadAttn + '\'' +
+                ", loadAttntel='" + loadAttntel + '\'' +
+                ", mdLoadAddr='" + mdLoadAddr + '\'' +
+                ", tMdLoadDate='" + tMdLoadDate + '\'' +
+                ", mdLoadAttn='" + mdLoadAttn + '\'' +
+                ", mdLoadAttnTel='" + mdLoadAttnTel + '\'' +
+                ", unLoadAddr='" + unLoadAddr + '\'' +
+                ", tUnLoadDate='" + tUnLoadDate + '\'' +
+                ", unLoadAttn='" + unLoadAttn + '\'' +
+                ", unLoadAttnTel='" + unLoadAttnTel + '\'' +
+                ", cntrId='" + cntrId + '\'' +
+                ", polId='" + polId + '\'' +
+                ", podId='" + podId + '\'' +
+                ", acceptDate='" + acceptDate + '\'' +
+                ", cntrQty='" + cntrQty + '\'' +
+                ", offData='" + offData + '\'' +
+                ", loadDate='" + loadDate + '\'' +
+                ", mdLoadDate='" + mdLoadDate + '\'' +
+                ", unLoadDate='" + unLoadDate + '\'' +
+                ", waybillDate='" + waybillDate + '\'' +
+                ", waybillRemarks='" + waybillRemarks + '\'' +
+                ", oilAmt='" + oilAmt + '\'' +
+                ", costOth='" + costOth + '\'' +
+                ", driverbonus='" + driverbonus + '\'' +
+                ", costRemarks='" + costRemarks + '\'' +
+                ", costomAmt06='" + costomAmt06 + '\'' +
+                ", costomAmt05='" + costomAmt05 + '\'' +
+                ", costomAmt04='" + costomAmt04 + '\'' +
+                ", costomAmt03='" + costomAmt03 + '\'' +
+                ", costomAmt02='" + costomAmt02 + '\'' +
+                ", costomAmt01='" + costomAmt01 + '\'' +
+                ", costomStr02='" + costomStr02 + '\'' +
+                ", costomStr01='" + costomStr01 + '\'' +
+                '}';
+    }
+}

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

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

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

@@ -1,8 +1,8 @@
 package com.ruoyi.orderPlan.mapper;
 
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
+import com.ruoyi.orderPlan.domain.FtmsorderbillscarsExcel;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscntrs;
 import org.apache.ibatis.annotations.Param;
 
@@ -102,7 +102,7 @@ public interface FtmsorderbillscarsMapper {
      * @param ftmsorderbills 条件
      * @return 结果
      */
-    public List<Map<String, Object>> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills);
+    public List<FtmsorderbillscarsExcel> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills);
 
     /**
      * 根据orgId更新数据状态
@@ -138,19 +138,20 @@ public interface FtmsorderbillscarsMapper {
 
     /**
      *  查询首页右上角数据
+     * @param tmsorderbills
      * @return  结果
      */
-    public List<Map<String, Object>> selectHomeUpperRightMapList();
+    public List<Map<String, Object>> selectHomeUpperRightMapList(Ftmsorderbills tmsorderbills);
 
     /**
      *  查询首页左上角新增计划数
      *  新增计划数(下了多少单的箱量)、未安排(未安排的箱量)
      *  今日派车(今日安排了多少车) 派车详情直接跳转到接单界面
      *  可派车辆(系统注册车辆-已安排车辆)
-     * @param currentDay    当前时间
+     * @param ftmsorderbills    当前时间
      * @return  结果
      */
-    public Map<String, Object> selectHomeUpperLeftCntrs(@Param("currentDay") List<String> currentDay);
+    public Map<String, Object> selectHomeUpperLeftCntrs(Ftmsorderbills ftmsorderbills);
 
     /**
      *  查询左上角 进入派车数
@@ -159,7 +160,7 @@ public interface FtmsorderbillscarsMapper {
      * @param currentDay    当前时间
      * @return  结果
      */
-    public int selectHomeUpperLeftCars(@Param("currentDay") List<String> currentDay);
+    public int selectHomeUpperLeftCars(Ftmsorderbills currentDay);
 
     /**
      *  根据司机姓名、手机号更新
@@ -170,6 +171,21 @@ public interface FtmsorderbillscarsMapper {
     /**
      *  根据查询条件查询 状态跟踪列表页 按钮数据
      * @return  结果
+     * @param ftmsorderbills
+     */
+    public Map<String, Object> getButtonValue(Ftmsorderbills ftmsorderbills);
+
+    /**
+     *  根据手机号查询司机 新订单、本月订单、本月历程、本月运费
+     * @param phoneNumber   手机号
+     * @return  结果
+     */
+    public int selectMissedOrdersCount(String phoneNumber);
+
+    /**
+     *  修改手机号更新未还柜的车辆信息根据司机id更新
+     * @param ftmsorderbillscars    参数
+     * @return  结果
      */
-    public Map<String, Object> getButtonValue();
+    public int updateftmsorderbillscarTel(Ftmsorderbillscars ftmsorderbillscars);
 }

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

@@ -1,6 +1,6 @@
-package com.ruoyi.statusTracking.mapper;
+package com.ruoyi.orderPlan.mapper;
 
-import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsfees;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
+import com.ruoyi.orderPlan.domain.FtmsorderbillscarsExcel;
 
 import java.util.List;
 import java.util.Map;
@@ -82,7 +83,7 @@ public interface IftmsorderbillscarsService {
      * @param ftmsorderbills    条件
      * @return  结果
      */
-    public List<Map<String, Object>> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills);
+    public List<FtmsorderbillscarsExcel> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills);
 
     /**
      *  司机操作接单/提箱/装卸货/还卸柜/回单操作  保存
@@ -146,4 +147,11 @@ public interface IftmsorderbillscarsService {
      * @return  结果
      */
     public Map<String, Object> getButtonValue();
+
+    /**
+     *  判断当前用户是否为车队、是否是司机
+     * @param ftmsorderbills
+     * @return
+     */
+    public Ftmsorderbills judgmentFleet(Ftmsorderbills ftmsorderbills);
 }

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

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

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

@@ -6,25 +6,27 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.basicData.domain.FleetCarManage;
+import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.mapper.FleetCarManageMapper;
+import com.ruoyi.basicData.mapper.TCorpsMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 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.orderPlan.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 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业务层处理
  *
@@ -34,6 +36,9 @@ import javax.validation.constraints.Size;
 @Service
 public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
     @Autowired
+    private TCorpsMapper tCorpsMapper;
+
+    @Autowired
     private FtmsorderbillsMapper ftmsorderbillsMapper;
 
     @Autowired
@@ -67,27 +72,35 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
     @Override
     public AjaxResult queryHomeInfo() {
         Map<String, Object> map = new HashMap<>();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Ftmsorderbills ftmsorderbills = new Ftmsorderbills();
+        if ("22".equals(user.getUserType())) {
+            ftmsorderbills.setIsFleet("1");
+            TCorps corps = tCorpsMapper.selectTCorpsByFTel(user.getPhonenumber());
+            ftmsorderbills.setFleetId(corps.getfId());
+        }
         //  查询右上 所有已结单、未结单数据
-        map.put("upperRight", ftmsorderbillscarsMapper.selectHomeUpperRightMapList());
+        map.put("upperRight", ftmsorderbillscarsMapper.selectHomeUpperRightMapList(ftmsorderbills));
         // 查询右下 提醒数据
         map.put("lowerRight", null);
         // 查询左上
         List<String> currentDay = DateUtils.getCurrentDay();
-        map.put("upperLeftCntrs", ftmsorderbillscarsMapper.selectHomeUpperLeftCntrs(currentDay));
+        ftmsorderbills.setcurrentDay(currentDay);
+        map.put("upperLeftCntrs", ftmsorderbillscarsMapper.selectHomeUpperLeftCntrs(ftmsorderbills));
         // 今日派车数量
-        int carQuantity = ftmsorderbillscarsMapper.selectHomeUpperLeftCars(currentDay);
+        int carQuantity = ftmsorderbillscarsMapper.selectHomeUpperLeftCars(ftmsorderbills);
         map.put("upperLeftCarQuantity", carQuantity);
         FleetCarManage fleetCarManage = new FleetCarManage();
-        fleetCarManage.setBillStatus(6L);
         fleetCarManage.setDelFlag("0");
-        int carManageQuantity = fleetCarManageMapper.selectFleetCarManageCount(fleetCarManage);
+        fleetCarManage.setBillStatus(6L);
+        int carManageQuantity = fleetCarManageMapper.selectManageCount(ftmsorderbills);
         int carNumber = carManageQuantity - carQuantity;
         if (carNumber < 0) {
             carNumber = 0;
         }
         map.put("upperLeftOldCarQuantity", carNumber);
         // 查询左下
-        map.put("lowerLeft", ftmsorderbillscarsMapper.selectHomeUpperRightMapList());
+        map.put("lowerLeft", ftmsorderbillscarsMapper.selectHomeUpperRightMapList(ftmsorderbills));
         return AjaxResult.success(map);
     }
 

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

@@ -28,15 +28,13 @@ import com.ruoyi.warehouseBusiness.mapper.BillnoDelMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import com.ruoyi.orderPlan.service.IftmsorderbillscarsService;
-import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
-import com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.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业务层处理
  *
@@ -139,15 +137,49 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     }
 
     /**
+     *  判断当前用户是否为车队、是否是司机
+     * @param ftmsorderbills    条件
+     * @return  结果
+     */
+    @Override
+    public Ftmsorderbills judgmentFleet(Ftmsorderbills ftmsorderbills) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        String phonenumber = user.getPhonenumber();
+        if ("11".equals(user.getUserType())) {
+            if (StringUtils.isNotEmpty(phonenumber)) {
+                ftmsorderbills.setDriverTel(phonenumber);
+            } else {
+                return null;
+            }
+        }
+        if ("22".equals(user.getUserType())) {
+            ftmsorderbills.setIsFleet("1");
+            TCorps corps = tCorpsMapper.selectTCorpsByFTel(phonenumber);
+            ftmsorderbills.setFleetId(corps.getfId());
+        }
+        return ftmsorderbills;
+    }
+
+    /**
      * 查询司机状态跟踪列表
      *
      * @param ftmsorderbills 条件
      * @return 结果
      */
     @Override
-    public List<Map<String, Object>> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills) {
+    public List<FtmsorderbillscarsExcel> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills) {
+        return ftmsorderbillscarsMapper.selectftmsorderbillscarsMapList(ftmsorderbills);
+    }
+
+    /**
+     *  根据查询条件查询 状态跟踪列表页 按钮数据
+     * @return  结果
+     */
+    @Override
+    public Map<String, Object> getButtonValue() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         String phonenumber = user.getPhonenumber();
+        Ftmsorderbills ftmsorderbills = new Ftmsorderbills();
         if ("11".equals(user.getUserType())) {
             if (StringUtils.isNotEmpty(phonenumber)) {
                 ftmsorderbills.setDriverTel(phonenumber);
@@ -163,7 +195,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             TCorps corps = tCorpsMapper.selectTCorpsByFTel(sysUser.getPhonenumber());
             ftmsorderbills.setFleetId(corps.getfId());
         }
-        return ftmsorderbillscarsMapper.selectftmsorderbillscarsMapList(ftmsorderbills);
+        return ftmsorderbillscarsMapper.getButtonValue(ftmsorderbills);
     }
 
     /**
@@ -179,11 +211,10 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             return AjaxResult.error("未找到司机信息，请确认手机号");
         }
         // 查询未接单数量
+        int count = ftmsorderbillscarsMapper.selectMissedOrdersCount(phoneNumber);
+        // 月份
         Ftmsorderbillscars ftmsorderbillscars = new Ftmsorderbillscars();
-        ftmsorderbillscars.setOrderStatus(10L);
         ftmsorderbillscars.setDriverTel(phoneNumber);
-        int count = ftmsorderbillscarsMapper.selectftmsorderbillscarsCount(ftmsorderbillscars);
-        // 月份
         ftmsorderbillscars.setMonthList(DateUtils.getMonth());
         Map<String, Object> map = ftmsorderbillscarsMapper.selectMonthlyOrder(ftmsorderbillscars);
         map.put("count", count);
@@ -191,15 +222,6 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     }
 
     /**
-     *  根据查询条件查询 状态跟踪列表页 按钮数据
-     * @return  结果
-     */
-    @Override
-    public Map<String, Object> getButtonValue() {
-        return ftmsorderbillscarsMapper.getButtonValue();
-    }
-
-    /**
      * 根据司机id查询详细信息
      *
      * @param ftmsorderbillscars 用户id
@@ -305,7 +327,11 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         if (StringUtils.isNotEmpty(status)) {
             return AjaxResult.error(status);
         }
-        long orderStatus = 1030L;
+        long actId = 1030L;
+        boolean orderStatus = false;
+        if (tmsorderbillscars.getOrderStatus() == 80L) {
+            orderStatus = true;
+        }
         if ("waybillDate".equals(operationType)) {
             // 回单提交
             if (StringUtils.isNull(tmsorderbillscars.getWaybillDate())) {
@@ -317,25 +343,41 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             if (StringUtils.isNull(tmsorderbillscars.getUnLoadDate())) {
                 return AjaxResult.error("未找到还卸柜时间");
             }
-            tmsorderbillscars.setOrderStatus(60L);
+            if (orderStatus) {
+                return AjaxResult.error("该运单已回单，若多次失败请联系管理员");
+            } else if (tmsorderbillscars.getOrderStatus() < 80L) {
+                tmsorderbillscars.setOrderStatus(60L);
+            }
         } else if ("mdLoadDate".equals(operationType)) {
             // 装卸货提交
             if (StringUtils.isNull(tmsorderbillscars.getMdLoadDate())) {
                 return AjaxResult.error("未找到装卸货时间");
             }
-            tmsorderbillscars.setOrderStatus(50L);
+            if (orderStatus) {
+                return AjaxResult.error("该运单已回单，若多次失败请联系管理员");
+            } else if (tmsorderbillscars.getOrderStatus() < 60L) {
+                tmsorderbillscars.setOrderStatus(50L);
+            }
         } else if ("loadDate".equals(operationType)) {
             // 提箱提交
             if (StringUtils.isNull(tmsorderbillscars.getLoadDate())) {
                 return AjaxResult.error("未找到提箱时间");
             }
-            tmsorderbillscars.setOrderStatus(40L);
+            if (orderStatus) {
+                return AjaxResult.error("该运单已回单，若多次失败请联系管理员");
+            } else if (tmsorderbillscars.getOrderStatus() < 50L) {
+                tmsorderbillscars.setOrderStatus(40L);
+            }
         } else if ("acceptDate".equals(operationType)) {
             // 接单提交
             if (StringUtils.isNull(tmsorderbillscars.getAcceptDate())) {
                 return AjaxResult.error("未找到接单时间");
             }
-            tmsorderbillscars.setOrderStatus(20L);
+            if (orderStatus) {
+                return AjaxResult.error("该运单已回单，若多次失败请联系管理员");
+            } else if (tmsorderbillscars.getOrderStatus() < 40L) {
+                tmsorderbillscars.setOrderStatus(20L);
+            }
         }
         tmsorderbillscars.setUpdateTime(new Date());
         tmsorderbillscars.setUpdateBy(SecurityUtils.getUsername());
@@ -345,7 +387,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         }
         Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
         ftmsorderbillsattachs.setPId(pId);
-        ftmsorderbillsattachs.setActId(orderStatus);
+        ftmsorderbillsattachs.setActId(actId);
         ftmsorderbillsattachsMapper.deleteftmsorderbillsattachs(ftmsorderbillsattachs);
         if (StringUtils.isNotEmpty(attachs) && !"[]".equals(attachs)) {
             JSONArray attachJson = JSONArray.parseArray(attachs);
@@ -354,7 +396,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
                 a.setPId(pId);
                 a.setOrgId(orgId);
                 a.setBillStatus(6L);
-                a.setActId(orderStatus);
+                a.setActId(actId);
                 a.setCreateTime(new Date());
                 a.setCreateBy(SecurityUtils.getUsername());
                 if (ftmsorderbillsattachsMapper.insertftmsorderbillsattachs(a) <= 0) {
@@ -646,6 +688,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     public AjaxResult vehicleChangeAdd(Ftmsorderbillscars ftmsorderbillscars, LoginUser loginUser) {
         Map<String, Object> map = new HashMap<>();
         Ftmsorderbillsplans ftmsorderbillsplans = ftmsorderbillsplansMapper.selectftmsorderbillsplansById(ftmsorderbillscars.getPId());
+        if (StringUtils.isNull(ftmsorderbillscars.getCntrQty())) {
+            return AjaxResult.error("未找到派车数量，请确认");
+        }
         long carQty = ftmsorderbillsplans.getCarQty() + ftmsorderbillscars.getCntrQty();
         if (ftmsorderbillsplans.getCntrQty() < carQty) {
             return AjaxResult.error("派车货量超出调度安排数量，请确认");

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

@@ -1,4 +1,4 @@
-package com.ruoyi.statusTracking.service.impl;
+package com.ruoyi.orderPlan.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -12,9 +12,9 @@ import com.ruoyi.common.utils.StringUtils;
 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.orderPlan.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.orderPlan.service.IftmsorderbillsfeesService;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,12 +1,10 @@
 package com.ruoyi.orderPlan.service.impl;
 
-import java.math.BigDecimal;
 import java.util.*;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -16,8 +14,8 @@ import com.ruoyi.framework.web.service.WechatService;
 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.orderPlan.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -193,6 +193,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectManageCount" parameterType="ftmsorderbills" resultType="int">
+        SELECT
+            COUNT( f.id )
+        FROM
+            fleet_car_manage f
+            LEFT JOIN t_corps fleet ON fleet.f_id = f.fleet_company_id
+        WHERE
+            f.bill_status = 6
+            AND f.del_flag = '0'
+        <if test="isFleet != null and isFleet == 1">
+            AND fleet.f_id = #{fleetId}
+        </if>
+    </select>
+
     <insert id="insertFleetCarManage" parameterType="FleetCarManage" useGeneratedKeys="true" keyProperty="id">
         insert into fleet_car_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -334,6 +348,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateFleetCarManageByDriverId" parameterType="FleetCarManage">
+        update fleet_car_manage
+        set driver_tel = #{driverTel}, driver_name = #{driverName}
+        where driver_id = #{driverId}
+    </update>
+
     <delete id="deleteFleetCarManageById" parameterType="Long">
         delete from fleet_car_manage where id = #{id}
     </delete>
@@ -429,6 +449,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="billStatus != null "> and bill_status = #{billStatus}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
-
     </select>
 </mapper>

ruoyi-fleet/src/main/resources/mapper/finance/FTmsaccbillsMapper.xml

@@ -316,7 +316,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test=" fToCorpid != null  and  fToCorpid != ''">and w.f_corpid = #{ fToCorpid} </if>
             <if test=" fMblno != null  and  fMblno != ''">and w.f_mblno  like concat('%', #{ fMblno}, '%') </if>
             <if test=" fStatementNo != null and  fStatementNo != ''">and w.f_statement_no  like concat('%', #{ fStatementNo}, '%') </if>
-
             <if test=' fReconciliation != null and  fReconciliation != "" and  fReconciliation == "1" '>
                 and w.f_accamount_date IS NOT NULL
             </if>
@@ -367,8 +366,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.f_name AS fCorpidName,
             f.f_accbilldate AS fAccbilldate,
             f.t_mblno AS tMblno,
-            f.amt AS fAmtdr,
+            f.charging_method AS chargingMethod,
+            f.f_amtdr AS fAmtdr,
+            f.f_amtcr AS fAmtcr,
+            f.bank AS bank,
             f.f_billtype AS fBilltype,
+            f.invoice_no AS invoiceNo,
+            f.create_time AS createTime,
+            f.water_bill_no AS waterBillNo,
+            f.f_system_type AS fSystemType,
             CASE
             WHEN  f.f_billstatus = '1' THEN '保存'
             WHEN  f.f_billstatus = '2' THEN '暂存'

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

@@ -407,7 +407,7 @@
         </where>
     </select>
 
-    <select id="selectftmsorderbillscarsMapList" parameterType="ftmsorderbills" resultType="Map">
+    <select id="selectftmsorderbillscarsMapList" parameterType="ftmsorderbills" resultType="ftmsorderbillscarsExcel">
         SELECT
             c.id,
             c.order_no orderNo,
@@ -426,7 +426,7 @@
             WHEN 50 THEN
             '装卸货'
             WHEN 60 THEN
-            '还卸柜子'
+            '还卸柜'
             WHEN 80 THEN
             '回单'
             END orderName,
@@ -524,13 +524,13 @@
             <if test="goodsId != null">and t.goods_id = #{goodsId}</if>
             <if test="driverTel != null">and c.driver_tel = #{driverTel}</if>
             <if test="orderStatus != null">and c.order_status = #{orderStatus}</if>
-            <if test="carStatus != null and carStatus == 'acceptDate'">and c.accept_date IS NULL</if>
-            <if test="carStatus != null and carStatus == 'loadDate'">and c.load_date IS NULL</if>
-            <if test="carStatus != null and carStatus == 'mdLoadDate'">and c.md_load_date IS NULL</if>
-            <if test="carStatus != null and carStatus == 'unLoadDate'">and c.un_load_date IS NULL</if>
-            <if test="carStatus != null and carStatus == 'waybillDate'">and c.waybill_date IS NULL</if>
-            <if test="isFleet != null and isFleet == '1'">
-                AND fleet.f_typeid = '["4"]'
+            <if test="carStatus != null and carStatus == 'planDate'">and c.plan_date IS NOT NULL</if>
+            <if test="carStatus != null and carStatus == 'acceptDate'">and c.accept_date IS NOT NULL</if>
+            <if test="carStatus != null and carStatus == 'loadDate'">and c.load_date IS NOT NULL</if>
+            <if test="carStatus != null and carStatus == 'mdLoadDate'">and c.md_load_date IS NOT NULL</if>
+            <if test="carStatus != null and carStatus == 'unLoadDate'">and c.un_load_date IS NOT NULL</if>
+            <if test="carStatus != null and carStatus == 'waybillDate'">and c.waybill_date IS NOT NULL</if>
+            <if test="isFleet != null and isFleet == 1">
                 AND fleet.f_id = #{fleetId}
             </if>
             <if test='planDate != null and planDate[0] != null and planDate[0]!= ""'>
@@ -603,6 +603,7 @@
             t.load_attn AS tLoadAttn,
             t.load_attntel AS tLoadAttntel,
             c.mblno,
+            c.driver_user_id AS driverUserId,
             c.driverbonus,
             g.f_name AS goodsId,
             c.order_status AS orderStatus,
@@ -632,7 +633,7 @@
             IFNULL( c.costom_amt_06, 0 ) AS costomAmt06,
             c.costom_str_01 AS costomStr01,
             c.costom_str_02 AS costomStr02,
-            IFNULL( c.load_date, t.load_date ) AS loadDate,
+            c.load_date AS loadDate,
             c.load_remarks AS loadRemarks,
             date_format( c.md_load_date, '%Y-%m-%d' ) AS mdLoadDate,
             c.md_load_remarks AS mdLoadRemarks,
@@ -668,7 +669,7 @@
         </where>
     </select>
 
-    <select id="selectHomeUpperRightMapList" resultType="Map">
+    <select id="selectHomeUpperRightMapList" parameterType="ftmsorderbills" resultType="Map">
         SELECT
             car.id,
             car.mblno,
@@ -678,43 +679,80 @@
         FROM
             F_TMSORDERBILLSCARS car
             LEFT JOIN F_TMSORDERBILLS bill ON bill.id = car.org_id
+            LEFT JOIN t_corps fleet ON fleet.f_id = car.carcor_pid
             LEFT JOIN t_corps t ON t.f_id = bill.corp_id
+        <where>
+            car.bill_status = 6
+            <if test="isFleet != null and isFleet == 1">
+                AND fleet.f_id = #{fleetId}
+            </if>
+        </where>
         ORDER BY
             car.id DESC
         LIMIT 10
     </select>
 
-    <select id="selectHomeUpperLeftCntrs" parameterType="list" resultType="Map">
+    <select id="selectHomeUpperLeftCntrs" parameterType="ftmsorderbills" resultType="Map">
         SELECT
-            IFNULL(SUM( cntr_qty ), 0)  planQuantity, IFNULL(SUM( cntr_blc_qty ), 0) surplusQuantity
+            IFNULL( SUM( p.cntr_qty ), 0 ) planQuantity,
+            IFNULL( SUM( ( p.cntr_qty - p.car_qty ) ), 0 ) surplusQuantity
         FROM
-            F_TMSORDERBILLSCNTRS
-        where
-            create_time &gt;= #{currentDay[0]}
-            and create_time &lt;= #{currentDay[1]}
+            F_TMSORDERBILLSPLANS p
+            LEFT JOIN t_corps fleet ON fleet.f_id = p.carcor_pid
+        WHERE
+            p.create_time &gt;= #{currentDay[0]}
+            AND p.create_time &lt;= #{currentDay[1]}
+            AND p.bill_status = 6
+            <if test="isFleet != null and isFleet == 1">
+                AND fleet.f_id = #{fleetId}
+            </if>
     </select>
 
-    <select id="selectHomeUpperLeftCars" parameterType="list" resultType="int">
+    <select id="selectHomeUpperLeftCars" parameterType="ftmsorderbills" resultType="int">
         SELECT
-            COUNT( id )
+            COUNT( car.id )
         FROM
-            F_TMSORDERBILLSCARS
-        where
-            create_time &gt;= #{currentDay[0]}
-            and create_time &lt;= #{currentDay[1]}
+            F_TMSORDERBILLSCARS car
+            LEFT JOIN t_corps fleet ON fleet.f_id = car.carcor_pid
+        <where>
+            car.bill_status = 6
+            and car.create_time &gt;= #{currentDay[0]}
+            and car.create_time &lt;= #{currentDay[1]}
+            <if test="isFleet != null and isFleet == 1">
+                AND fleet.f_id = #{fleetId}
+            </if>
+        </where>
     </select>
 
-    <select id="getButtonValue" resultType="Map">
+    <select id="getButtonValue" parameterType="ftmsorderbills" resultType="Map">
+--         SELECT
+--             order_status orderStatus,
+--             COUNT( id ) cntrQty
+--         FROM
+--             F_TMSORDERBILLSCARS
+--         WHERE
+--             bill_status = 6
+--         GROUP BY
+--             order_status
         SELECT
-            COUNT( CASE WHEN accept_date IS NULL THEN 1 END ) AS acceptDate,
-            COUNT( CASE WHEN load_date IS NULL THEN 1 END ) AS loadDate,
-            COUNT( CASE WHEN md_load_date IS NULL THEN 1 END ) AS mdLoadDate,
-            COUNT( CASE WHEN un_load_date IS NULL THEN 1 END ) AS unLoadDate,
-            COUNT( CASE WHEN waybill_date IS NULL THEN 1 END ) AS waybillDate
+            COUNT( c.id ) AS quantity,
+            COUNT( CASE WHEN c.plan_date IS NOT NULL THEN 1 END ) AS planDate,
+            COUNT( CASE WHEN c.accept_date IS NOT NULL THEN 1 END ) AS acceptDate,
+            COUNT( CASE WHEN c.load_date IS NOT NULL THEN 1 END ) AS loadDate,
+            COUNT( CASE WHEN c.md_load_date IS NOT NULL THEN 1 END ) AS mdLoadDate,
+            COUNT( CASE WHEN c.un_load_date IS NOT NULL THEN 1 END ) AS unLoadDate,
+            COUNT( CASE WHEN c.waybill_date IS NOT NULL THEN 1 END ) AS waybillDate
         FROM
-            F_TMSORDERBILLSCARS
+            F_TMSORDERBILLSCARS c
+            LEFT JOIN t_corps fleet ON fleet.f_id = c.carcor_pid
         WHERE
-            bill_status = 6
+            c.bill_status = 6
+            <if test="driverTel != null">and c.driver_tel = #{driverTel}</if>
+            <if test="isFleet != null and isFleet == 1">AND fleet.f_id = #{fleetId}</if>
+    </select>
+
+    <select id="selectMissedOrdersCount" parameterType="string" resultType="Integer">
+        select count(id) from F_TMSORDERBILLSCARS where driver_tel = #{phoneNumber} and bill_status = 6
     </select>
 
     <insert id="insertftmsorderbillscars" parameterType="ftmsorderbillscars" useGeneratedKeys="true" keyProperty="id">
@@ -1041,6 +1079,12 @@
             car.driver_user_id IS NOT NULL
     </update>
 
+    <update id="updateftmsorderbillscarTel" parameterType="ftmsorderbillscars">
+        update F_TMSORDERBILLSCARS
+        set driver_name = #{driverName}, driver_tel = #{driverTel}
+        where driver_user_id = #{driverUserId} AND order_status &lt; 60
+    </update>
+
     <delete id="deleteftmsorderbillscarsById" parameterType="Long">
         delete from F_TMSORDERBILLSCARS where id = #{id}
     </delete>

ruoyi-fleet/src/main/resources/mapper/statusTracking/ftmsorderbillsfeesMapper.xml → ruoyi-fleet/src/main/resources/mapper/orderPlan/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.statusTracking.mapper.FtmsorderbillsfeesMapper">
+<mapper namespace="com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper">
 
     <resultMap type="FTmsorderbillsfees" id="FTmsorderbillsfeesResult">
         <result property="fId" column="f_id"/>

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

@@ -102,7 +102,6 @@
             LEFT JOIN sys_dict_data prop ON prop.dict_type = 'data_transProp'
             AND prop.dict_value = f.trans_prop
             LEFT JOIN t_corps m ON m.f_id = plan.carcor_pid
-            AND m.f_typeid = '["4"]'
             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

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -534,6 +534,7 @@ public class SysUserServiceImpl implements ISysUserService {
             sysUser.setUserName("暂存");
             sysUser.setNickName("暂存");
             sysUser.setStatus("1");
+            System.out.println("啥都没做需要新增：" + sysUser.toString());
             userMapper.insertUser(sysUser);
         }
     }
@@ -581,11 +582,10 @@ public class SysUserServiceImpl implements ISysUserService {
             // 创建过
             if (related) {
                 pUser.setRelatedNo("T");
-            } else {
-//                pUser.setOpenId(user.getOpenId());
-                pUser.setSessionKey(user.getSessionKey());
             }
+            pUser.setOpenId(user.getOpenId());
             pUser.setUnionId(user.getUnionId());
+            pUser.setSessionKey(user.getSessionKey());
             userMapper.updateUser(pUser);
             loginUser.setUser(pUser);
             return loginUser;

ruoyi-system/src/main/java/com/ruoyi/system/wechatUtils/UserQueue.java

@@ -59,6 +59,7 @@ public class UserQueue {
                                 String body = response.body().string();
                                 //得到一个JSON对象
                                 JSONObject object = JSON.parseObject(body);
+                                System.out.println("获取公众号唯数据：" + object.toString());
                                 //声明系统用户
                                 SysUser sysUser = new SysUser();
                                 sysUser.setOpenId(object.getString("openid"));

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TGoods.java

@@ -74,6 +74,18 @@ public class TGoods extends BaseEntity {
     @Excel(name = "包装类型，存储id 显示名称 下拉选择类型，一个商品名称对应一个包装类型，对应t_package的f_id")
     private Long fPackageid;
 
+    /** 是否按箱号统计 */
+    @Excel(name = "是否按箱号统计")
+    private String ifCntrno;
+
+    public String getIfCntrno() {
+        return ifCntrno;
+    }
+
+    public void setIfCntrno(String ifCntrno) {
+        this.ifCntrno = ifCntrno;
+    }
+
     /**
      * 状态
      */
@@ -184,24 +196,20 @@ public class TGoods extends BaseEntity {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("fId", getfId())
-                .append("fTypeid", getfTypeid())
-                .append("fNo", getfNo())
-                .append("fName", getfName())
-                .append("fEnam", getfEnam())
-                .append("fSpecs", getfSpecs())
-                .append("fPackagespecs", getfPackagespecs())
-                .append("fColor", getfColor())
-                .append("fHscode", getfHscode())
-                .append("fPackageid", getfPackageid())
-                .append("fStatus", getfStatus())
-                .append("delFlag", getDelFlag())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
+        return "TGoods{" +
+                "fId=" + fId +
+                ", fTypeid=" + fTypeid +
+                ", fNo='" + fNo + '\'' +
+                ", fName='" + fName + '\'' +
+                ", fEnam='" + fEnam + '\'' +
+                ", fSpecs='" + fSpecs + '\'' +
+                ", fPackagespecs='" + fPackagespecs + '\'' +
+                ", fColor='" + fColor + '\'' +
+                ", fHscode='" + fHscode + '\'' +
+                ", fPackageid=" + fPackageid +
+                ", ifCntrno='" + ifCntrno + '\'' +
+                ", fStatus='" + fStatus + '\'' +
+                ", delFlag='" + delFlag + '\'' +
+                '}';
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCorpsMapper.java

@@ -107,6 +107,20 @@ public interface TCorpsMapper extends BaseMapper<TCorps> {
     public TCorps selectTCorpsByFTel(String phonenumber);
 
     /**
+     *  车队使用，查询客户、司机信息
+     * @param fId
+     * @return
+     */
+    public List<TCorps> selectCorpList(Long fId);
+
+    /**
+     *  车队使用，查询客户、车队信息
+     * @return
+     * @param tCorps
+     */
+    public List<TCorps> selectCustomerDriverList(TCorps tCorps);
+
+    /**
      * 获取客户名称
      * @param tel
      * @return

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITCorpsService.java

@@ -93,6 +93,20 @@ public interface ITCorpsService {
      * @return
      */
     public List<Map<String, Object>> selectFleetDriverMsgListMap(TCorps tCorps);
+
+    /**
+     *  车队使用，查询客户、司机信息
+     * @param fId
+     * @return
+     */
+    public List<TCorps> selectCorpList(Long fId);
+
+    /**
+     *  车队使用，查询客户、车队信息
+     * @return
+     * @param tCorps
+     */
+    public List<TCorps> selectCustomerDriverList(TCorps tCorps);
     /**
      * 获取客户名称
      * @param tel

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java

@@ -70,10 +70,33 @@ public class TCorpsServiceImpl implements ITCorpsService {
      */
     @Override
     public List<TCorps> selectTCorpsList(TCorps tCorps) {
+        if (StringUtils.isNotEmpty(tCorps.getfTypeid())) {
+            tCorps.setfTypeid("\""+tCorps.getfTypeid()+"\"");
+        }
         return tCorpsMapper.selectTCorpsList(tCorps);
     }
 
     /**
+     *  车队使用，查询客户、司机信息
+     * @param fId
+     * @return
+     */
+    @Override
+    public List<TCorps> selectCorpList(Long fId) {
+        return tCorpsMapper.selectCorpList(fId);
+    }
+
+    /**
+     *  车队使用，查询客户、车队信息
+     * @param tCorps
+     * @return
+     */
+    @Override
+    public List<TCorps> selectCustomerDriverList(TCorps tCorps) {
+        return tCorpsMapper.selectCustomerDriverList(tCorps);
+    }
+
+    /**
      * 新增客户详情
      *
      * @param tCorps            客户详情
@@ -226,4 +249,5 @@ public class TCorpsServiceImpl implements ITCorpsService {
     public List<Map<String, Object>> getClientName(String tel) {
         return tCorpsMapper.getClientName(tel);
     }
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java

@@ -110,6 +110,13 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
     public List<Map<String, Object>> selectDetailedList(TWarehousebill tWarehousebill);
 
     /**
+     *  根据提单号在当天时出现多少次
+     * @param warehouseBills     提单号
+     * @return  结果
+     */
+    public int selectContainMblno(TWarehouseBills warehouseBills);
+
+    /**
      * 凯和订单查询
      * @param tWarehouseBills
      * @return

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -272,6 +272,13 @@ public interface ITWarehouseBillsService {
     public AjaxResult saveWarehouse(String information);
 
     /**
+     *  查询提单号是否在一天当中出现多次
+     * @param tWarehouseBills   仓库数据
+     * @return  结果
+     */
+    public AjaxResult selectContainMblno(String tWarehouseBills, String billsType);
+
+    /**
      * 凯和网页版查询我的订单
      * @param tWarehouseBills
      * @return

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -345,6 +345,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         } else {
             tWhgenleg.setfMblno(warehouseBills.getfMblno());
         }
+        // 箱号
+        if (StringUtils.isNotEmpty(warehousebillsitems.getfBoxno())) {
+            tWhgenleg.setfCntrno(warehousebillsitems.getfBoxno());
+        }
         // 库区
         tWhgenleg.setfWarehouseLocationid(warehousebillsitems.getfWarehouselocid());
         // 货物品名
@@ -1277,6 +1281,24 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success();
     }
 
+    /**
+     *  查询提单号是否在一天当中出现多次
+     * @param tWarehouseBills   仓库数据
+     * @return  结果
+     */
+    @Override
+    public AjaxResult selectContainMblno(String tWarehouseBills, String billsType) {
+        TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
+        warehouseBills.setfBilltype(billsType);
+        String mblno = warehouseBills.getfMblno();
+        Date bsdate = warehouseBills.getfBsdate();
+        int count = tWarehouseBillsMapper.selectContainMblno(warehouseBills);
+        if (count >= 1) {
+            return AjaxResult.success("提单号：" + mblno + ",日期：" + DateUtils.dateTime(bsdate) + ",出现" + count + "次", false);
+        }
+        return AjaxResult.success(true);
+    }
+
     @Override
     public List<TWarehouseBills> webVersionOrder(TWarehouseBills tWarehouseBills) {
         List<TWarehouseBills> warehouseBills = tWarehouseBillsMapper.webVersionOrderList(tWarehouseBills);

ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -70,7 +70,8 @@
     <select id="selectTCorpsList" parameterType="TCorps" resultMap="TCorpsResult">
         <include refid="selectTCorpsVo"/>
         <where>
-            <if test="fTypeid != null  and fTypeid != ''"> and f_typeid like concat('%', #{fTypeid}, '%')</if>
+            <if test="fTypeid != null  and fTypeid != ''"> and JSON_CONTAINS( f_typeid -> '$[*]', #{fTypeid}, '$')</if>
+            <if test="fTypeid == null or fTypeid == ''"> and f_typeid != '[\"100\"]' and f_typeid != '[\"102\"]'</if>
             <if test="fPid != null  and fPid != ''"> and f_pid = #{fPid}</if>
             <if test="fNo != null  and fNo != ''"> and f_no = #{fNo}</if>
             <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
@@ -120,6 +121,7 @@
             <if test="registerdAddress != null  and registerdAddress != ''"> and registerd_address = #{registerdAddress}</if>
             <if test="manageScope != null  and manageScope != ''"> and manage_scope = #{manageScope}</if>
         </where>
+            ORDER BY CONVERT(f_name USING gbk) asc
     </select>
 
     <select id="selectTCorpsById" parameterType="Long" resultMap="TCorpsResult">
@@ -127,6 +129,39 @@
         where f_id = #{fId}
     </select>
 
+    <select id="selectCorpList" parameterType="long" resultMap="TCorpsResult">
+        SELECT
+            c.f_id,
+            c.f_pid,
+            c.f_typeid,
+            c.f_no,
+            c.f_name
+        FROM
+            t_corps c
+            LEFT JOIN F_TMSORDERBILLSCARS car ON car.driver_tel = c.f_tel
+        WHERE
+            c.f_typeid != '[\"100\"]'
+            AND c.f_typeid != '[\"102\"]'
+            OR car.id = #{fId}
+    </select>
+
+    <select id="selectCustomerDriverList" parameterType="TCorps" resultMap="TCorpsResult">
+        SELECT
+            c.f_id,
+            c.f_pid,
+            c.f_typeid,
+            c.f_no,
+            c.f_name
+        FROM
+            t_corps c
+            LEFT JOIN F_TMSORDERBILLSCARS car ON car.driver_tel = c.f_tel
+        <where>
+            c.f_typeid != '[\"102\"]'
+            and c.f_status = '0'
+            <if test="fName != null  and fName != ''"> and c.f_name like concat('%', #{fName}, '%')</if>
+        </where>
+    </select>
+
     <select id="selectFleetDriverMsgListMap" parameterType="TCorps" resultType="Map">
         SELECT
             c.f_id AS id,
@@ -159,7 +194,7 @@
             <if test="fName != null  and fName != ''"> and c.f_name like concat('%', #{fName}, '%')</if>
             <if test="fCname != null  and fCname != ''"> and c.f_cname like concat('%', #{fCname}, '%')</if>
             <if test="fEname != null  and fEname != ''"> and c.f_ename like concat('%', #{fEname}, '%')</if>
-            <if test="fTel != null  and fTel != ''"> and c.f_tel = #{fTel}</if>
+            <if test="fTel != null  and fTel != ''"> and c.f_tel like concat('%', #{fTel}, '%')</if>
             <if test="fFax != null  and fFax != ''"> and c.f_fax = #{fFax}</if>
             <if test="fEmail != null  and fEmail != ''"> and c.f_email = #{fEmail}</if>
             <if test="fManage != null  and fManage != ''"> and c.f_manage = #{fManage}</if>
@@ -173,7 +208,7 @@
         </where>
     </select>
 
-    <select id="selectTCorpsByFTel" resultType="string" parameterType="TCorps">
+    <select id="selectTCorpsByFTel" parameterType="String" resultMap="TCorpsResult">
         select f_id, f_pid, f_typeid, f_no, f_name from t_corps where f_tel = #{phonenumber}
     </select>
 

ruoyi-warehouse/src/main/resources/mapper/basicData/TGoodsMapper.xml

@@ -5,33 +5,35 @@
 <mapper namespace="com.ruoyi.basicData.mapper.TGoodsMapper">
 
     <resultMap type="TGoods" id="TGoodsResult">
-        <result property="fId" column="f_id"/>
-        <result property="fTypeid" column="f_typeid"/>
-        <result property="fNo" column="f_no"/>
-        <result property="fName" column="f_name"/>
-        <result property="fEnam" column="f_enam"/>
-        <result property="fSpecs" column="f_specs"/>
-        <result property="fPackagespecs" column="f_packagespecs"/>
-        <result property="fColor" column="f_color"/>
-        <result property="fHscode" column="f_hscode"/>
-        <result property="fPackageid" column="f_packageid"/>
-        <result property="fStatus" column="f_status"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
+        <result property="fId"    column="f_id"    />
+        <result property="fTypeid"    column="f_typeid"    />
+        <result property="fNo"    column="f_no"    />
+        <result property="fName"    column="f_name"    />
+        <result property="fEnam"    column="f_enam"    />
+        <result property="fSpecs"    column="f_specs"    />
+        <result property="fPackagespecs"    column="f_packagespecs"    />
+        <result property="fColor"    column="f_color"    />
+        <result property="fHscode"    column="f_hscode"    />
+        <result property="fPackageid"    column="f_packageid"    />
+        <result property="ifCntrno"    column="if_cntrno"    />
+        <result property="fStatus"    column="f_status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectTGoodsVo">
-        select f_id, f_typeid, f_no, f_name, f_enam, f_specs, f_packagespecs, f_color, f_hscode, f_packageid, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_goods
+        select f_id, f_typeid, f_no, f_name, f_enam, f_specs, f_packagespecs, f_color, f_hscode, f_packageid, if_cntrno, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_goods
     </sql>
 
     <select id="selectTGoodsList" parameterType="TGoods" resultMap="TGoodsResult">
         <include refid="selectTGoodsVo"/>
         <where>
             <if test="fTypeid != null  and fTypeid != ''">and f_typeid = #{fTypeid}</if>
+            <if test="ifCntrno != null  and ifCntrno != ''">and if_cntrno = #{ifCntrno}</if>
             <if test="fNo != null  and fNo != ''">and f_no like concat('%', #{fNo}, '%')</if>
             <if test="fName != null  and fName != ''">and f_name like concat('%', #{fName}, '%')</if>
             <if test="fEnam != null  and fEnam != ''">and f_enam like concat('%', #{fEnam}, '%')</if>
@@ -52,15 +54,16 @@
     <insert id="insertTGoods" parameterType="TGoods" useGeneratedKeys="true" keyProperty="fId">
         insert into t_goods
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fTypeid != null and fTypeid != ''">f_typeid,</if>
+            <if test="fTypeid != null">f_typeid,</if>
             <if test="fNo != null and fNo != ''">f_no,</if>
             <if test="fName != null and fName != ''">f_name,</if>
-            <if test="fEnam != null">f_enam,</if>
-            <if test="fSpecs != null">f_specs,</if>
+            <if test="fEnam != null and fEnam != ''">f_enam,</if>
+            <if test="fSpecs != null and fSpecs != ''">f_specs,</if>
             <if test="fPackagespecs != null">f_packagespecs,</if>
             <if test="fColor != null">f_color,</if>
             <if test="fHscode != null">f_hscode,</if>
             <if test="fPackageid != null">f_packageid,</if>
+            <if test="ifCntrno != null">if_cntrno,</if>
             <if test="fStatus != null">f_status,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -70,15 +73,16 @@
             <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fTypeid != null and fTypeid != ''">#{fTypeid},</if>
+            <if test="fTypeid != null">#{fTypeid},</if>
             <if test="fNo != null and fNo != ''">#{fNo},</if>
             <if test="fName != null and fName != ''">#{fName},</if>
-            <if test="fEnam != null">#{fEnam},</if>
-            <if test="fSpecs != null">#{fSpecs},</if>
+            <if test="fEnam != null and fEnam != ''">#{fEnam},</if>
+            <if test="fSpecs != null and fSpecs != ''">#{fSpecs},</if>
             <if test="fPackagespecs != null">#{fPackagespecs},</if>
             <if test="fColor != null">#{fColor},</if>
             <if test="fHscode != null">#{fHscode},</if>
             <if test="fPackageid != null">#{fPackageid},</if>
+            <if test="ifCntrno != null">#{ifCntrno},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -92,15 +96,16 @@
     <update id="updateTGoods" parameterType="TGoods">
         update t_goods
         <trim prefix="SET" suffixOverrides=",">
-            <if test="fTypeid != null and fTypeid != ''">f_typeid = #{fTypeid},</if>
+            <if test="fTypeid != null">f_typeid = #{fTypeid},</if>
             <if test="fNo != null and fNo != ''">f_no = #{fNo},</if>
             <if test="fName != null and fName != ''">f_name = #{fName},</if>
-            <if test="fEnam != null">f_enam = #{fEnam},</if>
-            <if test="fSpecs != null">f_specs = #{fSpecs},</if>
+            <if test="fEnam != null and fEnam != ''">f_enam = #{fEnam},</if>
+            <if test="fSpecs != null and fSpecs != ''">f_specs = #{fSpecs},</if>
             <if test="fPackagespecs != null">f_packagespecs = #{fPackagespecs},</if>
             <if test="fColor != null">f_color = #{fColor},</if>
             <if test="fHscode != null">f_hscode = #{fHscode},</if>
             <if test="fPackageid != null">f_packageid = #{fPackageid},</if>
+            <if test="ifCntrno != null">if_cntrno = #{ifCntrno},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -180,6 +180,7 @@
         <where>
             <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
             <if test="fMblno != null ">and f_mblno = #{fMblno}</if>
+            <if test="fCntrno != null ">and f_cntrno = #{fCntrno}</if>
             <if test="fWarehouseLocationid != null ">and f_warehouse_locationid = #{fWarehouseLocationid}</if>
             <if test="fGoodsid != null ">and f_goodsid = #{fGoodsid}</if>
             <if test="fTrademodeid != null ">and f_trademodeid = #{fTrademodeid}</if>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -671,46 +671,48 @@
         ${params.dataScope}
     </select>
     <select id="selectInventorySJCKList" parameterType="TWarehousebills" resultType="java.util.Map">
+
+    <select id="selectInventorySJCKList" parameterType="TWarehousebills"  resultType="java.util.Map">
         SELECT
-        co.f_name AS fName,
-        it.f_bsdate AS fBsdate,
-        leg.f_mblno AS fMblno,
-        it.f_business_type AS fBusinessType,
-        dict.dict_label AS fBusinessTypes,
-        it.f_marks AS fMarks ,
-        goo.f_name AS fGoodsName,
-        dicttr.dict_label AS fTrademodeid,
-        it.f_qty AS fQty,
-        it.f_grossweight AS fGrossweight,
-        it.f_netweight AS fNetweight,
-        CASE
-        it.f_billtype
-        WHEN 'SJRK' THEN
-        '入库'
-        WHEN 'SJCK' THEN
-        '出库'
-        WHEN 'CKDB' THEN
-        '调拨'
-        END AS fBilltype ,
-        CASE
-        it.f_billtype
-        WHEN 'SJRK' THEN
-        it.f_warehouse_information
-        WHEN 'SJCK' THEN
-        it.f_warehouse_information
-        WHEN 'CKDB' THEN
-        it.f_orgwarehouse_information
-        END AS fWarehouseLocationids
+            co.f_name AS fName,
+            it.f_bsdate AS fBsdate,
+            leg.f_mblno AS fMblno,
+            it.f_business_type AS fBusinessType,
+            dict.dict_label AS fBusinessTypes,
+            it.f_marks AS fMarks ,
+            goo.f_name AS fGoodsName,
+            dicttr.dict_label AS fTrademodeid,
+            it.f_qty AS fQty,
+            it.f_grossweight AS fGrossweight,
+            it.f_netweight AS fNetweight,
+            CASE
+            it.f_billtype
+            WHEN 'SJRK' THEN
+            '入库'
+            WHEN 'SJCK' THEN
+            '出库'
+            WHEN 'CKDB' THEN
+            '调拨'
+            END AS fBilltype ,
+            CASE
+            it.f_billtype
+            WHEN 'SJRK' THEN
+            it.f_warehouse_information
+            WHEN 'SJCK' THEN
+            it.f_warehouse_information
+            WHEN 'CKDB' THEN
+            it.f_orgwarehouse_information
+            END AS fWarehouseLocationids
         FROM
-        t_warehousebills leg
-        left join sys_user u on leg.create_by = u.user_name
-        left join sys_dept d on leg.f_bsdeptid = d.dept_id
-        LEFT JOIN t_warehousebillsitems it ON leg.f_id = it.f_pid
-        LEFT JOIN t_goods goo ON it.f_goodsid = goo.f_id
-        LEFT JOIN t_corps co ON leg.f_corpid = co.f_id
-        LEFT JOIN sys_dict_data dict ON dict.dict_value = it.f_business_type
-        LEFT JOIN t_warehouse ware ON ware.f_id = it.f_warehouselocid
-        LEFT JOIN sys_dict_data dicttr ON dicttr.dict_value = leg.f_trademodeid
+            t_warehousebills leg
+            left join sys_user u on leg.create_by = u.user_name
+            left join sys_dept d on leg.f_bsdeptid = d.dept_id
+            LEFT JOIN t_warehousebillsitems it ON leg.f_id = it.f_pid
+            LEFT JOIN t_goods goo ON it.f_goodsid = goo.f_id
+            LEFT JOIN t_corps co ON leg.f_corpid = co.f_id
+            LEFT JOIN sys_dict_data dict ON dict.dict_value = it.f_business_type
+            LEFT JOIN t_warehouse ware ON ware.f_id = it.f_warehouselocid
+            LEFT JOIN sys_dict_data dicttr ON dicttr.dict_value = leg.f_trademodeid
         <where>
             dict.status = '0'
             AND leg.f_typeid IS NULL
@@ -738,6 +740,7 @@
         </where>
         ${params.dataScope}
     </select>
+
     <select id="selectTWarehousebillsItemList"
             resultType="com.ruoyi.reportManagement.domain.TWareHouseItemsExcel">
         SELECT
@@ -794,6 +797,17 @@
         </if>
     </select>
 
+    <select id="selectContainMblno" parameterType="TWarehousebills" resultType="int">
+        SELECT
+            count( f_id )
+        FROM
+            t_warehousebills
+        where
+            f_mblno = #{mblNo}
+            AND f_bsdate = #{currentDay}
+            AND f_billtype = #{fBilltype}
+    </select>
+
     <insert id="insertTWarehousebills" parameterType="TWarehousebills" useGeneratedKeys="true" keyProperty="fId">
         insert into t_warehousebills
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsMapper.xml

@@ -124,6 +124,7 @@
             item.f_billno AS fBillno,
             item.f_goodsid AS fGoodsid,
             goods.f_name AS fGoodsids,
+            goods.if_cntrno AS ifCntrno,
             item.f_warehouselocid AS fWarehouselocid,
             area.f_name AS fWarehouselocids,
             ware.f_name AS fWarehouseids,