From 2a658f5db16ec4ea269a9c27c06879b0c4252ead Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 16 十二月 2025 14:13:51 +0800
Subject: [PATCH] 修改客户新增
---
/dev/null | 343 ------------------------------------------
tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java | 15 +
tms/src/main/java/com/ruoyi/tms/service/impl/TmsCustomerInfoServiceImpl.java | 36 ++++
tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java | 26 --
tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceServiceImpl.java | 20 --
5 files changed, 57 insertions(+), 383 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/controller/TmsContainerController.java b/tms/src/main/java/com/ruoyi/tms/controller/TmsContainerController.java
deleted file mode 100644
index 15080cb..0000000
--- a/tms/src/main/java/com/ruoyi/tms/controller/TmsContainerController.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.ruoyi.tms.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.file.DownloadExportUtil;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.tms.domain.TmsContainer;
-import com.ruoyi.tms.service.ITmsContainerService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 闆嗚绠辩鐞咰ontroller
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-@RestController
-@RequestMapping("/tms/tmsContainer")
-public class TmsContainerController extends BaseController
-{
- @Autowired
- private ITmsContainerService tmsContainerService;
-
-
-
- /**
- * 鏌ヨ闆嗚绠辩鐞嗗垪琛�
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsContainer:list')")
- @GetMapping("/list")
- public TableDataInfo list(TmsContainer tmsContainer)
- {
- startPage();
- List<TmsContainer> list = tmsContainerService.selectTmsContainerList(tmsContainer);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭闆嗚绠辩鐞嗗垪琛�
- * @param tmsContainer 鏌ヨ鏉′欢瀵硅薄
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsContainer:export')")
- @Log(title = "闆嗚绠辩鐞�", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public AjaxResult export(TmsContainer tmsContainer,String exportKey)
- {
- tmsContainerService.export(tmsContainer,exportKey);
- return AjaxResult.success("瀵煎嚭璇锋眰鎴愬姛锛岃绋嶅悗鐐瑰嚮涓嬭浇...!");
- }
-
-
-
- /**
- * 鑾峰彇闆嗚绠辩鐞嗚缁嗕俊鎭�
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsContainer:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Integer id)
- {
- return AjaxResult.success(tmsContainerService.selectTmsContainerById(id));
- }
-
- /**
- * 鏂板闆嗚绠辩鐞�
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsContainer:add')")
- @Log(title = "闆嗚绠辩鐞�", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody TmsContainer tmsContainer)
- {
- return toAjax(tmsContainerService.insertTmsContainer(tmsContainer));
- }
-
- /**
- * 淇敼闆嗚绠辩鐞�
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsContainer:edit')")
- @Log(title = "闆嗚绠辩鐞�", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody TmsContainer tmsContainer)
- {
- return toAjax(tmsContainerService.updateTmsContainer(tmsContainer));
- }
-
- /**
- * 鍒犻櫎闆嗚绠辩鐞�
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsContainer:remove')")
- @Log(title = "闆嗚绠辩鐞�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Integer[] ids)
- {
- return toAjax(tmsContainerService.deleteTmsContainerByIds(ids));
- }
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java b/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
deleted file mode 100644
index f93c0c3..0000000
--- a/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.ruoyi.tms.controller;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.ruoyi.tms.domain.TmsDriverDispatch;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.file.DownloadExportUtil;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.tms.domain.TmsDispatchOrder;
-import com.ruoyi.tms.service.ITmsDispatchOrderService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 璋冨害鍗曠鐞咰ontroller
- *
- * @author ruoyi
- * @date 2025-11-04
- */
-@RestController
-@RequestMapping("/tms/tmsDispatchOrder")
-public class TmsDispatchOrderController extends BaseController
-{
- @Autowired
- private ITmsDispatchOrderService tmsDispatchOrderService;
-
-
-
- /**
- * 鏌ヨ璋冨害鍗曠鐞嗗垪琛�
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:list')")
- @GetMapping("/list")
- public TableDataInfo list(TmsDispatchOrder tmsDispatchOrder)
- {
- startPage();
- List<TmsDispatchOrder> list = tmsDispatchOrderService.selectTmsDispatchOrderList(tmsDispatchOrder);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭璋冨害鍗曠鐞嗗垪琛�
- * @param tmsDispatchOrder 鏌ヨ鏉′欢瀵硅薄
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:export')")
- @Log(title = "璋冨害鍗曠鐞�", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public AjaxResult export(TmsDispatchOrder tmsDispatchOrder,String exportKey)
- {
- tmsDispatchOrderService.export(tmsDispatchOrder,exportKey);
- return AjaxResult.success("瀵煎嚭璇锋眰鎴愬姛锛岃绋嶅悗鐐瑰嚮涓嬭浇...!");
- }
-
-
-
- /**
- * 鑾峰彇璋冨害鍗曠鐞嗚缁嗕俊鎭�
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Integer id)
- {
- return AjaxResult.success(tmsDispatchOrderService.selectTmsDispatchOrderById(id));
- }
-
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:confirmOrder')")
- @GetMapping(value = "/confirmOrder/{id}")
- public AjaxResult confirmOrder(@PathVariable("id") Integer id)
- {
- return tmsDispatchOrderService.confirmOrder(id);
- }
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:copyOrder')")
- @GetMapping(value = "/copyOrder/{id}")
- public AjaxResult copyOrder(@PathVariable("id") Integer id)
- {
- return tmsDispatchOrderService.copyOrder(id);
- }
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:okOrder')")
- @GetMapping(value = "/okOrder/{id}")
- public AjaxResult okOrder(@PathVariable("id") Integer id)
- {
- return tmsDispatchOrderService.okOrder(id);
- }
-
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:dropHook')")
- @GetMapping(value = "/dropHook/{id}")
- public AjaxResult dropHook(@PathVariable("id") Integer id)
- {
- return tmsDispatchOrderService.dropHook(id);
- }
-
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:connectHang')")
- @PostMapping(value = "/connectHang")
- public AjaxResult connectHang(@RequestBody TmsDriverDispatch driverDispatch)
- {
- return tmsDispatchOrderService.connectHang(driverDispatch);
- }
-
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:customsOrder')")
- @PostMapping(value = "/customsOrder")
- public AjaxResult customsOrder(@RequestBody TmsDispatchOrder tmsDispatchOrder)
- {
- return toAjax(tmsDispatchOrderService.customsOrder(tmsDispatchOrder));
- }
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:loadingOrder')")
- @PostMapping(value = "/loadingOrder")
- public AjaxResult loadingOrder(@RequestBody TmsDispatchOrder tmsDispatchOrder)
- {
- return toAjax(tmsDispatchOrderService.loadingOrder(tmsDispatchOrder));
- }
-
- /**
- * 鏂板璋冨害鍗曠鐞�
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:add')")
- @Log(title = "璋冨害鍗曠鐞�", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody TmsDispatchOrder tmsDispatchOrder)
- {
- return toAjax(tmsDispatchOrderService.insertTmsDispatchOrder(tmsDispatchOrder));
- }
-
- /**
- * 淇敼璋冨害鍗曠鐞�
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:edit')")
- @Log(title = "璋冨害鍗曠鐞�", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody TmsDispatchOrder tmsDispatchOrder)
- {
- return toAjax(tmsDispatchOrderService.updateTmsDispatchOrder(tmsDispatchOrder));
- }
-
- /**
- * 鍒犻櫎璋冨害鍗曠鐞�
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:remove')")
- @Log(title = "璋冨害鍗曠鐞�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Integer[] ids)
- {
- return toAjax(tmsDispatchOrderService.deleteTmsDispatchOrderByIds(ids));
- }
- @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:generate')")
- @Log(title = "璋冨害鍗曠鐞�", businessType = BusinessType.OTHER)
- @GetMapping("/initGenerate/{ids}")
- public AjaxResult initGenerate(@PathVariable Integer[] ids)
- {
- return AjaxResult.success(tmsDispatchOrderService.initGenerate(Arrays.asList(ids)));
- }
-
- @GetMapping("/generateTmsDispatchOrder/{ids}")
- public AjaxResult generateTmsDispatchOrder(@PathVariable Integer[] ids){
- return tmsDispatchOrderService.generateTmsDispatchOrder(Arrays.asList(ids));
- }
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/controller/TmsShelfController.java b/tms/src/main/java/com/ruoyi/tms/controller/TmsShelfController.java
deleted file mode 100644
index c4fcdd7..0000000
--- a/tms/src/main/java/com/ruoyi/tms/controller/TmsShelfController.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.ruoyi.tms.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.file.DownloadExportUtil;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.tms.domain.TmsShelf;
-import com.ruoyi.tms.service.ITmsShelfService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 鎵樻灦绠＄悊Controller
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-@RestController
-@RequestMapping("/tms/tmsShelf")
-public class TmsShelfController extends BaseController
-{
- @Autowired
- private ITmsShelfService tmsShelfService;
-
-
-
- /**
- * 鏌ヨ鎵樻灦绠＄悊鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsShelf:list')")
- @GetMapping("/list")
- public TableDataInfo list(TmsShelf tmsShelf)
- {
- startPage();
- List<TmsShelf> list = tmsShelfService.selectTmsShelfList(tmsShelf);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鎵樻灦绠＄悊鍒楄〃
- * @param tmsShelf 鏌ヨ鏉′欢瀵硅薄
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsShelf:export')")
- @Log(title = "鎵樻灦绠＄悊", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public AjaxResult export(TmsShelf tmsShelf,String exportKey)
- {
- tmsShelfService.export(tmsShelf,exportKey);
- return AjaxResult.success("瀵煎嚭璇锋眰鎴愬姛锛岃绋嶅悗鐐瑰嚮涓嬭浇...!");
- }
-
-
-
- /**
- * 鑾峰彇鎵樻灦绠＄悊璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsShelf:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Integer id)
- {
- return AjaxResult.success(tmsShelfService.selectTmsShelfById(id));
- }
-
- /**
- * 鏂板鎵樻灦绠＄悊
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsShelf:add')")
- @Log(title = "鎵樻灦绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody TmsShelf tmsShelf)
- {
- return toAjax(tmsShelfService.insertTmsShelf(tmsShelf));
- }
-
- /**
- * 淇敼鎵樻灦绠＄悊
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsShelf:edit')")
- @Log(title = "鎵樻灦绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody TmsShelf tmsShelf)
- {
- return toAjax(tmsShelfService.updateTmsShelf(tmsShelf));
- }
-
- /**
- * 鍒犻櫎鎵樻灦绠＄悊
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsShelf:remove')")
- @Log(title = "鎵樻灦绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Integer[] ids)
- {
- return toAjax(tmsShelfService.deleteTmsShelfByIds(ids));
- }
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/controller/TmsVehicleController.java b/tms/src/main/java/com/ruoyi/tms/controller/TmsVehicleController.java
deleted file mode 100644
index 621fb5d..0000000
--- a/tms/src/main/java/com/ruoyi/tms/controller/TmsVehicleController.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.ruoyi.tms.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.file.DownloadExportUtil;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.tms.domain.TmsVehicle;
-import com.ruoyi.tms.service.ITmsVehicleService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 杞﹁締绠＄悊Controller
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-@RestController
-@RequestMapping("/tms/tmsVehicle")
-public class TmsVehicleController extends BaseController
-{
- @Autowired
- private ITmsVehicleService tmsVehicleService;
-
-
-
- /**
- * 鏌ヨ杞﹁締绠＄悊鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicle:list')")
- @GetMapping("/list")
- public TableDataInfo list(TmsVehicle tmsVehicle)
- {
- startPage();
- List<TmsVehicle> list = tmsVehicleService.selectTmsVehicleList(tmsVehicle);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭杞﹁締绠＄悊鍒楄〃
- * @param tmsVehicle 鏌ヨ鏉′欢瀵硅薄
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicle:export')")
- @Log(title = "杞﹁締绠＄悊", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public AjaxResult export(TmsVehicle tmsVehicle,String exportKey)
- {
- tmsVehicleService.export(tmsVehicle,exportKey);
- return AjaxResult.success("瀵煎嚭璇锋眰鎴愬姛锛岃绋嶅悗鐐瑰嚮涓嬭浇...!");
- }
-
-
-
- /**
- * 鑾峰彇杞﹁締绠＄悊璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicle:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Integer id)
- {
- return AjaxResult.success(tmsVehicleService.selectTmsVehicleById(id));
- }
-
- /**
- * 鏂板杞﹁締绠＄悊
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicle:add')")
- @Log(title = "杞﹁締绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody TmsVehicle tmsVehicle)
- {
- return toAjax(tmsVehicleService.insertTmsVehicle(tmsVehicle));
- }
-
- /**
- * 淇敼杞﹁締绠＄悊
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicle:edit')")
- @Log(title = "杞﹁締绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody TmsVehicle tmsVehicle)
- {
- return toAjax(tmsVehicleService.updateTmsVehicle(tmsVehicle));
- }
-
- /**
- * 鍒犻櫎杞﹁締绠＄悊
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicle:remove')")
- @Log(title = "杞﹁締绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Integer[] ids)
- {
- return toAjax(tmsVehicleService.deleteTmsVehicleByIds(ids));
- }
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/controller/TmsVehicleDocumentController.java b/tms/src/main/java/com/ruoyi/tms/controller/TmsVehicleDocumentController.java
deleted file mode 100644
index 034ca0d..0000000
--- a/tms/src/main/java/com/ruoyi/tms/controller/TmsVehicleDocumentController.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.ruoyi.tms.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.file.DownloadExportUtil;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.tms.domain.TmsVehicleDocument;
-import com.ruoyi.tms.service.ITmsVehicleDocumentService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 杞﹁締璇佷欢Controller
- *
- * @author ruoyi
- * @date 2025-11-04
- */
-@RestController
-@RequestMapping("/tms/tmsVehicleDocument")
-public class TmsVehicleDocumentController extends BaseController
-{
- @Autowired
- private ITmsVehicleDocumentService tmsVehicleDocumentService;
-
-
-
- /**
- * 鏌ヨ杞﹁締璇佷欢鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicleDocument:list')")
- @GetMapping("/list")
- public TableDataInfo list(TmsVehicleDocument tmsVehicleDocument)
- {
- startPage();
- List<TmsVehicleDocument> list = tmsVehicleDocumentService.selectTmsVehicleDocumentList(tmsVehicleDocument);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭杞﹁締璇佷欢鍒楄〃
- * @param tmsVehicleDocument 鏌ヨ鏉′欢瀵硅薄
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicleDocument:export')")
- @Log(title = "杞﹁締璇佷欢", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public AjaxResult export(TmsVehicleDocument tmsVehicleDocument,String exportKey)
- {
- tmsVehicleDocumentService.export(tmsVehicleDocument,exportKey);
- return AjaxResult.success("瀵煎嚭璇锋眰鎴愬姛锛岃绋嶅悗鐐瑰嚮涓嬭浇...!");
- }
-
-
-
- /**
- * 鑾峰彇杞﹁締璇佷欢璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicleDocument:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Integer id)
- {
- return AjaxResult.success(tmsVehicleDocumentService.selectTmsVehicleDocumentById(id));
- }
-
- /**
- * 鏂板杞﹁締璇佷欢
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicleDocument:add')")
- @Log(title = "杞﹁締璇佷欢", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody TmsVehicleDocument tmsVehicleDocument)
- {
- return toAjax(tmsVehicleDocumentService.insertTmsVehicleDocument(tmsVehicleDocument));
- }
-
- /**
- * 淇敼杞﹁締璇佷欢
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicleDocument:edit')")
- @Log(title = "杞﹁締璇佷欢", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody TmsVehicleDocument tmsVehicleDocument)
- {
- return toAjax(tmsVehicleDocumentService.updateTmsVehicleDocument(tmsVehicleDocument));
- }
-
- /**
- * 鍒犻櫎杞﹁締璇佷欢
- */
- @PreAuthorize("@ss.hasPermi('tms:tmsVehicleDocument:remove')")
- @Log(title = "杞﹁締璇佷欢", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Integer[] ids)
- {
- return toAjax(tmsVehicleDocumentService.deleteTmsVehicleDocumentByIds(ids));
- }
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsContainer.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsContainer.java
deleted file mode 100644
index da5efdf..0000000
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsContainer.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package com.ruoyi.tms.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.util.Date;
-
-import lombok.Data;
-
-/**
- * 闆嗚绠辩鐞嗗璞� tms_container
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-@Data
-public class TmsContainer {
-
-
- /**
- * 涓婚敭ID
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
-
- /**
- * 绯荤粺缂栧彿
- */
- @Excel(name = "绯荤粺缂栧彿")
- @TableField("system_code")
- private String systemCode;
- /**
- * 鑷惀绫诲瀷
- */
- @TableField("self_leas_type")
- private Integer selfLeasType;
-
- /**
- * 闆嗚绠卞彿
- */
- @Excel(name = "闆嗚绠卞彿")
- @TableField("container_code")
- private String containerCode;
-
-
- /**
- * 闆嗚绠辩敤閫旂被鍨�
- */
- @Excel(name = "闆嗚绠辩敤閫旂被鍨�")
- @TableField("container_use_type")
- private Integer containerUseType;
-
-
- /**
- * 绠卞瀷
- */
- @Excel(name = "绠卞瀷")
- @TableField("container_size")
- private Integer containerSize;
-
-
- /**
- * 浜ф潈褰掑睘锛堝叧鑱旇溅闃熶俊鎭鐞嗭級
- */
- @Excel(name = "浜ф潈褰掑睘", readConverterExp = "鍏�=鑱旇溅闃熶俊鎭鐞�")
- @TableField("owner_team_id")
- private Integer ownerTeamId;
-
- @TableField("owner_team_name")
- private String ownerTeamName;
-
-
- /**
- * 鐢熶骇鍘傚晢
- */
- @Excel(name = "鐢熶骇鍘傚晢")
- @TableField("manufacturer")
- private String manufacturer;
-
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("manufacture_date")
- private Date manufactureDate;
-
-
- /**
- * 闆嗚绠遍暱搴︼紙mm锛�
- */
- @TableField("length_mm")
- private BigDecimal lengthMm;
-
-
- /**
- * 闆嗚绠卞搴︼紙mm锛�
- */
- @TableField("width_mm")
- private BigDecimal widthMm;
-
-
- /**
- * 闆嗚绠遍珮搴︼紙mm锛�
- */
- @TableField("height_mm")
- private BigDecimal heightMm;
-
-
- /**
- * 鏈�澶ф�婚噸锛坘g锛�
- */
- @TableField("max_total_weight_kg")
- private BigDecimal maxTotalWeightKg;
-
-
- /**
- * 鏈�澶ц浇閲嶏紙kg锛�
- */
- @TableField("max_load_kg")
- private BigDecimal maxLoadKg;
-
-
- /**
- * 瀹圭Н锛坢鲁锛�
- */
- @TableField("volume_m3")
- private BigDecimal volumeM3;
-
-
- /**
- * 鏄惁鍦ㄧ敤
- */
- @Excel(name = "鏄惁鍦ㄧ敤")
- @TableField("is_in_use")
- private Integer isInUse;
-
-
- /**
- * 缁存姢鐘舵��
- */
- @Excel(name = "缁存姢鐘舵��")
- @TableField("maintenance_status")
- private Integer maintenanceStatus;
-
-
- /**
- * 鏈�杩戠淮鎶ゆ棩鏈�
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("last_maintenance_date")
- private Date lastMaintenanceDate;
-
-
- /**
- * 涓嬫缁存姢鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("next_maintenance_date")
- private Date nextMaintenanceDate;
-
-
- /**
- * 鐘舵��
- */
- @Excel(name = "鐘舵��")
- @TableField("status")
- private Integer status;
-
-
- /**
- * 鍒涘缓浜�
- */
- @TableField("create_by")
- private String createBy;
-
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("create_time")
- private Date createTime;
-
-
- /**
- * 鏇存柊浜�
- */
- @Excel(name = "鏇存柊浜�")
- @TableField("update_by")
- private String updateBy;
-
-
- /**
- * 鏇存柊鏃堕棿
- */
- @Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("update_time")
- private Date updateTime;
-
-
- /**
- * 澶囨敞
- */
- @TableField("remark")
- private String remark;
-
-
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java
index e1279f5..33510be 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java
@@ -9,7 +9,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.Date;
+import java.util.List;
+import com.ruoyi.cwgl.domain.BankAccountConfig;
+import com.ruoyi.cwgl.domain.InvoiceInfo;
import lombok.Data;
/**
@@ -198,5 +201,17 @@
@TableField("remark")
private String remark;
+ /**
+ * 鍙戠エ淇℃伅鍒楄〃
+ */
+ @TableField(exist = false)
+ private List<InvoiceInfo> invoiceInfoList;
+
+ /**
+ * 閾惰璐﹀彿閰嶇疆鍒楄〃
+ */
+ @TableField(exist = false)
+ private List<BankAccountConfig> bankAccountConfigList;
+
}
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
deleted file mode 100644
index 4b6783f..0000000
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
+++ /dev/null
@@ -1,505 +0,0 @@
-package com.ruoyi.tms.domain;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.Date;
-import lombok.Data;
-/**
- * 璋冨害鍗曠鐞嗗璞� tms_dispatch_order
- *
- * @author ruoyi
- * @date 2025-11-10
- */
-@Data
-public class TmsDispatchOrder{
-
-
- /** 涓婚敭ID */
- @TableId(value="id",type = IdType.AUTO)
- private Integer id;
-
-
- /** 璋冨害鍗曞彿 */
- @Excel(name = "璋冨害鍗曞彿")
- @TableField("dispatch_no")
- private String dispatchNo;
-
-
- /** 瀹㈡埛ID */
- @Excel(name = "瀹㈡埛ID")
- @TableField("customer_id")
- private Integer customerId;
-
- @TableField("customer_code")
- private String customerCode;
-
- /** 瀹㈡埛缂栫爜 */
- @TableField("customer_name")
- private String customerName;
-
-
-
- /** 鍏宠仈椤圭洰ID */
- @Excel(name = "鍏宠仈椤圭洰ID")
- @TableField("project_id")
- private Integer projectId;
-
-
- /** 椤圭洰鍚嶇О */
- @Excel(name = "椤圭洰鍚嶇О")
- @TableField("project_name")
- private String projectName;
-
-
- /** 鍏宠仈鍚堝悓Id */
- @Excel(name = "鍏宠仈鍚堝悓Id")
- @TableField("contract_id")
- private Integer contractId;
-
-
- /** 鍏宠仈鍚堝悓鍚嶇О */
- @Excel(name = "鍏宠仈鍚堝悓鍚嶇О")
- @TableField("contract_name")
- private String contractName;
-
-
- /** 杩愯緭绾胯矾 */
- @Excel(name = "杩愯緭绾胯矾")
- @TableField("transport_line")
- private String transportLine;
-
-
- /** 璁㈠崟绫诲瀷锛屽叧鑱斿瓧鍏� */
- @Excel(name = "璁㈠崟绫诲瀷锛屽叧鑱斿瓧鍏�")
- @TableField("order_type")
- private Integer orderType;
-
-
- /** 绛炬敹绫诲瀷锛屽叧鑱斿瓧鍏� */
- @Excel(name = "绛炬敹绫诲瀷锛屽叧鑱斿瓧鍏�")
- @TableField("sign_type")
- private Integer signType;
-
-
- /** 涓婚┚椹跺憳 */
- @Excel(name = "涓婚┚椹跺憳")
- @TableField("main_driver_id")
- private Integer mainDriverId;
-
- @TableField("main_driver_name")
- private String mainDriverName;
-
-
- /** 鍓┚椹跺憳 */
- @TableField("assistant_driver_id")
- private Integer assistantDriverId;
-
- @TableField("assistant_driver_name")
- private String assistantDriverName;
-
- /** 杞﹁締鏈嶅姟鍟咺D */
- @Excel(name = "杞﹁締鏈嶅姟鍟咺D")
- @TableField("vehicle_provider_id")
- private Integer vehicleProviderId;
-
- /** 杞﹁締鏈嶅姟鍟嗗悕绉� */
- @Excel(name = "杞﹁締鏈嶅姟鍟嗗悕绉�")
- @TableField("vehicle_provider_name")
- private String vehicleProviderName;
-
-
- /** 瑁呰揣鏈嶅姟鍟咺D */
- @Excel(name = "瑁呰揣鏈嶅姟鍟咺D")
- @TableField("loading_service_provider_id")
- private Integer loadingServiceProviderId;
-
-
- /** 瑁呰揣鏈嶅姟鍟嗗悕绉� */
- @Excel(name = "瑁呰揣鏈嶅姟鍟嗗悕绉�")
- @TableField("loading_service_provider_name")
- private String loadingServiceProviderName;
-
-
- /** 鎶ュ叧鏈嶅姟鍟咺D */
- @Excel(name = "鎶ュ叧鏈嶅姟鍟咺D")
- @TableField("customs_service_provider_id")
- private Integer customsServiceProviderId;
-
-
- /** 鎶ュ叧鏈嶅姟鍟嗗悕绉� */
- @Excel(name = "鎶ュ叧鏈嶅姟鍟嗗悕绉�")
- @TableField("customs_service_provider_name")
- private String customsServiceProviderName;
-
-
- /** 鏄惁绱ф�ワ紝0=鏄紝1=鍚︼紝榛樿鍚� */
- @Excel(name = "鏄惁绱ф�ワ紝0=鏄紝1=鍚︼紝榛樿鍚�")
- @TableField("is_urgent")
- private Integer isUrgent;
-
-
- /** 杩愯緭鏂瑰紡锛堝瓧鍏革級0=姹借繍锛�1=娴疯繍锛�2=绌鸿繍锛�3=娌宠繍锛�4=閾佽矾锛�5=鑱旇繍 */
- @Excel(name = "杩愯緭鏂瑰紡", readConverterExp = "瀛�=鍏�")
- @TableField("transport_type")
- private Integer transportType;
-
-
- /** 閰嶈浇鏂瑰紡锛堝瓧鍏革級0=鏁存煖锛�1=鏁磋溅锛�2=鎷艰溅锛�3=鏁ｆ煖 */
- @Excel(name = "閰嶈浇鏂瑰紡", readConverterExp = "瀛�=鍏�")
- @TableField("load_method")
- private Integer loadMethod;
-
-
-
- /** 瑕佹眰杩愯緭宸ュ叿绫诲瀷 */
- @Excel(name = "瑕佹眰杩愯緭宸ュ叿绫诲瀷")
- @TableField("required_vehicle_types")
- private String requiredVehicleTypes;
-
-
- /** 闆嗚绠卞彿 */
- @TableField("container_no")
- private String containerNo;
-
- @TableField("container_id")
- private Integer containerId;
-
-
- /** 杞﹁締绠＄悊琛↖D */
- @Excel(name = "杞﹁締绠＄悊琛↖D")
- @TableField("vehicle_id")
- private Integer vehicleId;
-
-
- /** 杞︾墝鍙� */
- @Excel(name = "杞︾墝鍙�")
- @TableField("license_plate")
- private String licensePlate;
-
-
- /** 瑕佹眰鏈�鏃╁嚭鍙戞椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("earliest_departure")
- private Date earliestDeparture;
-
-
- /** 鍙戣揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
- @Excel(name = "鍙戣揣浜�", readConverterExp = "鍏�=鑱旀敹鍙戣揣浜轰俊鎭�")
- @TableField("shipper_id")
- private Integer shipperId;
-
-
- /** 瑕佹眰鏈�鏅氬嚭鍙戞椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("latest_departure")
- private Date latestDeparture;
-
-
- /** 鍙戣揣浜哄悕绉� */
- @Excel(name = "鍙戣揣浜哄悕绉�")
- @TableField("shipper_name")
- private String shipperName;
-
-
- /** 鍙戣揣浜烘墜鏈哄彿 */
- @Excel(name = "鍙戣揣浜烘墜鏈哄彿")
- @TableField("shipper_mobile")
- private String shipperMobile;
-
-
- /** 瑕佹眰鏈�鏃╁埌杈炬椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("earliest_arrival")
- private Date earliestArrival;
-
-
- /** 鍙戣揣浜哄湴鍧� */
- @Excel(name = "鍙戣揣浜哄湴鍧�")
- @TableField("shipper_address")
- private String shipperAddress;
-
-
- /** 瑕佹眰鏈�鏅氬埌杈炬椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("latest_arrival")
- private Date latestArrival;
-
-
- /** 鍙戣揣琛屾斂鍖哄煙 */
- @Excel(name = "鍙戣揣琛屾斂鍖哄煙")
- @TableField("shipper_region_code")
- private String shipperRegionCode;
-
- @Excel(name = "鍙戣揣琛屾斂鍖哄煙")
- @TableField("shipper_region_label")
- private String shipperRegionLabel;
-
-
-
-
-
- /** 鏀惰揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
- @Excel(name = "鏀惰揣浜�", readConverterExp = "鍏�=鑱旀敹鍙戣揣浜轰俊鎭�")
- @TableField("receiver_id")
- private Integer receiverId;
-
-
-
-
- /** 鏀惰揣浜哄悕绉� */
- @Excel(name = "鏀惰揣浜哄悕绉�")
- @TableField("receiver_name")
- private String receiverName;
-
-
- /** 瀹為檯杩愯緭宸ュ叿绫诲瀷 */
- @TableField("actual_vehicle_type")
- private String actualVehicleType;
-
-
-
-
-
- /** 鏀惰揣浜烘墜鏈哄彿 */
- @Excel(name = "鏀惰揣浜烘墜鏈哄彿")
- @TableField("receiver_mobile")
- private String receiverMobile;
-
-
-
-
-
- /** 鏀惰揣浜哄湴鍧� */
- @Excel(name = "鏀惰揣浜哄湴鍧�")
- @TableField("receiver_address")
- private String receiverAddress;
-
-
-
- /** 鏀惰揣琛屾斂鍖哄煙 */
- @Excel(name = "鏀惰揣琛屾斂鍖哄煙")
- @TableField("receiver_region_code")
- private String receiverRegionCode;
-
- @Excel(name = "鏀惰揣琛屾斂鍖哄煙")
- @TableField("receiver_region_label")
- private String receiverRegionLabel;
-
- /** 鍑哄彂鍦板湴鍧� */
- @TableField("departure_address")
- private String departureAddress;
-
-
- /** 鐩殑鍦板湴鍧� */
- @TableField("destination_address")
- private String destinationAddress;
-
- /** 瀹為檯鍑哄彂鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_departure")
- private Date actualDeparture;
-
-
- /** 瀹為檯鍒拌揪鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_arrival")
- private Date actualArrival;
-
- /** 瀹為檯鍗歌溅瀹屾垚鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_unload_end")
- private Date actualUnloadEnd;
- /** 瀹為檯瑁呰溅寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_load_start")
- private Date actualLoadStart;
- /** 瀹炲彂鏁伴噺 */
- @TableField("actual_quantity")
- private BigDecimal actualQuantity;
-
-
- /** 瀹炲彂閲嶉噺(kg) */
- @TableField("actual_weight")
- private BigDecimal actualWeight;
-
-
- /** 瀹炲彂浣撶Н(m鲁) */
- @TableField("actual_volume")
- private BigDecimal actualVolume;
-
-
- /** 澶嶇閲嶉噺(kg) */
- @TableField("reweigh_weight")
- private BigDecimal reweighWeight;
-
-
-
-
- /** 鐢靛瓙閿佺紪鍙� */
- @TableField("electronic_lock")
- private String electronicLock;
-
-
- /** 杞︽澘鍙� */
- @TableField("shelf_id")
- private Integer shelfId;
-
- @TableField("shelf_code")
- private String shelfCode;
-
-
- /** 绌鸿浇閲岀▼(Km) */
- @TableField("empty_mileage")
- private BigDecimal emptyMileage;
-
-
- /** 绌鸿浇娌硅��(L) */
- @TableField("empty_fuel")
- private BigDecimal emptyFuel;
-
-
- /** 閲嶈浇閲岀▼(Km) */
- @TableField("loaded_mileage")
- private BigDecimal loadedMileage;
-
-
- /** 閲嶈浇娌硅��(L) */
- @TableField("loaded_fuel")
- private BigDecimal loadedFuel;
-
-
- /** 鐝鍙� */
- @TableField("shift_no")
- private String shiftNo;
-
-
- /** 绾胯矾鍙� */
- @TableField("line_no")
- private String lineNo;
-
-
- /** 鐘舵�� */
- @Excel(name = "鐘舵��")
- @TableField("status")
- private Integer status;
-
-
- /** 鍒涘缓浜� */
- @TableField("create_by")
- private String createBy;
-
-
- /** 鍒涘缓鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("create_time")
- private Date createTime;
- @TableField(exist = false)
- private String createTimeBegin;
- @TableField(exist = false)
- private String createTimeEnd;
-
- /** 鏇存柊浜� */
- @Excel(name = "鏇存柊浜�")
- @TableField("update_by")
- private String updateBy;
-
-
- /** 鏇存柊鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @TableField("update_time")
- private Date updateTime;
- @TableField(exist = false)
- private String updateTimeBegin;
- @TableField(exist = false)
- private String updateTimeEnd;
-
- /** 澶囨敞 */
- @TableField("remark")
- private String remark;
-
-
- /** 搴旀敹璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触 */
- @Excel(name = "搴旀敹璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触")
- @TableField("accounts_receivable_status")
- private Integer accountsReceivableStatus;
-
-
- /** 搴斾粯璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触 */
- @Excel(name = "搴斾粯璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触")
- @TableField("accounts_payable_status")
- private Integer accountsPayableStatus;
-
- @TableField("collection_plan_id")
- private Integer collectionPlanId;
- @TableField(exist = false)
- private Integer collectionPlanDetailId;
-
- @TableField(exist = false)
- private BigDecimal collectionPlanAmount;
-
- @TableField(exist = false)
- private String collectionPlanName;
-
- @TableField("payment_plan_id")
- private Integer paymentPlanId;
-
- @TableField(exist = false)
- private String paymentPlanName;
- @TableField(exist = false)
- private Integer paymentPlanDetailId;
-
- @TableField(exist = false)
- private BigDecimal paymentPlanAmount;
-
-
- @TableField("is_customs")
- private Integer isCustoms;
-
- @TableField("is_load")
- private Integer isLoad;
-
- @TableField("start_region_code")
- private String startRegionCode;
- @TableField("end_region_code")
- private String endRegionCode;
-
- @TableField("quote_detail_id")
- private Integer quoteDetailId;
-
- @TableField("operation_mode")
- private Integer operationMode;
- @Excel(name = "鍏宠仈鎶ヤ环鏂规ID")
- @TableField("quote_plan_id")
- private Integer quotePlanId;
-
- /**
- * 纭鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("confirm_time")
- private Date confirmTime;
- @TableField(exist = false)
- private String confirmTimeBegin;
- @TableField(exist = false)
- private String confirmTimeEnd;
- /**
- * 瀹屾垚鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("ok_time")
- private Date okTime;
-
- @TableField(exist = false)
- private String okTimeBegin;
- @TableField(exist = false)
- private String okTimeEnd;
- @TableField("commission_model")
- private Integer commissionModel;
-
-}
\ No newline at end of file
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsShelf.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsShelf.java
deleted file mode 100644
index 5c97db4..0000000
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsShelf.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.ruoyi.tms.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.util.Date;
-
-import lombok.Data;
-
-/**
- * 鎵樻灦绠＄悊瀵硅薄 tms_shelf
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-@Data
-public class TmsShelf {
-
-
- /**
- * 涓婚敭ID
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
-
- /**
- * 绯荤粺缂栧彿锛屾柊澧炴椂鑷姩濉啓
- */
- @Excel(name = "绯荤粺缂栧彿锛屾柊澧炴椂鑷姩濉啓")
- @TableField("system_code")
- private String systemCode;
-
-
- /**
- * 鎵樻灦缂栧彿锛屽敮涓�鏍囪瘑
- */
- @Excel(name = "鎵樻灦缂栧彿锛屽敮涓�鏍囪瘑")
- @TableField("shelf_code")
- private String shelfCode;
-
- /**
- * 鑷惀绫诲瀷
- */
- @TableField("self_leas_type")
- private Integer selfLeasType;
-
- /**
- * 鎵樻灦绫诲瀷
- */
- @Excel(name = "鎵樻灦绫诲瀷")
- @TableField("shelf_type")
- private Integer shelfType;
-
-
- /**
- * 浜ф潈褰掑睘
- */
- @Excel(name = "浜ф潈褰掑睘")
- @TableField("owner_team_id")
- private String ownerTeamId;
-
- @TableField("owner_team_name")
- private String ownerTeamName;
- /**
- * 鐢熶骇鍘傚晢
- */
- @Excel(name = "鐢熶骇鍘傚晢")
- @TableField("manufacturer")
- private String manufacturer;
-
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("manufacture_date")
- private Date manufactureDate;
-
-
- /**
- * 鎵樻灦闀垮害锛坢m锛�
- */
- @TableField("length_mm")
- private BigDecimal lengthMm;
-
-
- /**
- * 鎵樻灦瀹藉害锛坢m锛�
- */
- @TableField("width_mm")
- private BigDecimal widthMm;
-
-
- /**
- * 鎵樻灦楂樺害锛坢m锛�
- */
- @TableField("height_mm")
- private BigDecimal heightMm;
-
-
- /**
- * 鎵胯浇閲嶉噺锛圞g锛�
- */
- @Excel(name = "鎵胯浇閲嶉噺", readConverterExp = "K=g")
- @TableField("max_load_kg")
- private BigDecimal maxLoadKg;
-
-
- /**
- * 閫傞厤闆嗚绠辩被鍨�
- */
- @Excel(name = "閫傞厤闆嗚绠辩被鍨�")
- @TableField("compatible_container_type")
- private String compatibleContainerType;
-
-
- /**
- * 鏄惁鍦ㄧ敤
- */
- @Excel(name = "鏄惁鍦ㄧ敤")
- @TableField("is_in_use")
- private Integer isInUse;
-
-
- /**
- * 缁存姢鐘舵��
- */
- @Excel(name = "缁存姢鐘舵��")
- @TableField("maintenance_status")
- private Integer maintenanceStatus;
-
-
- /**
- * 鏈�杩戠淮鎶ゆ棩鏈�
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("last_maintenance_date")
- private Date lastMaintenanceDate;
-
-
- /**
- * 涓嬫缁存姢鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("next_maintenance_date")
- private Date nextMaintenanceDate;
-
-
- /**
- * 鐘舵��
- */
- @Excel(name = "鐘舵��")
- @TableField("status")
- private Integer status;
-
-
- /**
- * 鍒涘缓浜�
- */
- @TableField("create_by")
- private String createBy;
-
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("create_time")
- private Date createTime;
-
-
- /**
- * 鏇存柊浜�
- */
- @Excel(name = "鏇存柊浜�")
- @TableField("update_by")
- private String updateBy;
-
-
- /**
- * 鏇存柊鏃堕棿
- */
- @Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("update_time")
- private Date updateTime;
-
-
- /**
- * 澶囨敞
- */
- @TableField("remark")
- private String remark;
-
-
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsVehicle.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsVehicle.java
deleted file mode 100644
index defd2fc..0000000
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsVehicle.java
+++ /dev/null
@@ -1,371 +0,0 @@
-package com.ruoyi.tms.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.util.Date;
-
-import lombok.Data;
-
-/**
- * 杞﹁締绠＄悊瀵硅薄 tms_vehicle
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-@Data
-public class TmsVehicle {
-
-
- /**
- * 涓婚敭ID
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
-
- /**
- * 绯荤粺缂栧彿锛屾柊澧炴椂鑷姩濉啓
- */
- @Excel(name = "绯荤粺缂栧彿锛屾柊澧炴椂鑷姩濉啓")
- @TableField("system_code")
- private String systemCode;
-
-
- /**
- * 杞﹁締鏈嶅姟鍟嗭紙鍏宠仈鏈嶅姟鍟嗕俊鎭鐞嗭級
- */
- @Excel(name = "杞﹁締鏈嶅姟鍟�", readConverterExp = "鍏�=鑱旀湇鍔″晢淇℃伅绠＄悊")
- @TableField("service_provider_id")
- private Integer serviceProviderId;
-
- @TableField("service_provider_name")
- private String serviceProviderName;
-
-
- /**
- * 杞﹁締绫诲瀷
- */
- @Excel(name = "杞﹁締绫诲瀷")
- @TableField("vehicle_type")
- private String vehicleType;
-
-
- /**
- * 杞﹁締鍐呴儴缂栫爜
- */
- @Excel(name = "杞﹁締鍐呴儴缂栫爜")
- @TableField("internal_code")
- private String internalCode;
-
-
- /**
- * 杞︾墝鍙�
- */
- @Excel(name = "杞︾墝鍙�")
- @TableField("license_plate")
- private String licensePlate;
-
-
- /**
- * 棣欐腐鐗岀収
- */
- @Excel(name = "棣欐腐鐗岀収")
- @TableField("license_hk")
- private String licenseHk;
-
-
- /**
- * 婢抽棬鐗岀収
- */
- @Excel(name = "婢抽棬鐗岀収")
- @TableField("license_mo")
- private String licenseMo;
-
-
- /**
- * 鐗岀収棰滆壊
- */
- @TableField("license_color")
- private String licenseColor;
-
-
- /**
- * 杞︿富
- */
- @TableField("owner")
- private String owner;
-
-
- /**
- * 鏄惁榛戝悕鍗曪細0=鏄紝1=鍚︼紝榛樿涓哄惁
- */
- @TableField("is_blacklist")
- private Integer isBlacklist;
-
-
- /**
- * 鏄惁娴峰叧鐩戠锛�0=鏄紝1=鍚︼紝榛樿涓哄惁
- */
- @TableField("is_customs_control")
- private Integer isCustomsControl;
-
-
- /**
- * 鏄惁鎸傝溅锛�0=鏄紝1=鍚�
- */
- @TableField("is_trailer")
- private Integer isTrailer;
-
-
- /**
- * 涓婚┚椹跺憳
- */
- @Excel(name = "涓婚┚椹跺憳")
- @TableField("main_driver")
- private String mainDriver;
-
-
- /**
- * 涓婚┚椹跺憳鑱旂郴鏂瑰紡
- */
- @TableField("main_driver_phone")
- private String mainDriverPhone;
-
-
- /**
- * 鍓┚椹跺憳
- */
- @TableField("assistant_driver")
- private String assistantDriver;
-
-
- /**
- * 鍓┚椹跺憳鑱旂郴鏂瑰紡
- */
- @TableField("assistant_driver_phone")
- private String assistantDriverPhone;
-
-
- /**
- * 鏄惁鏈変换鍔★細0=鏄紝1=鍚︼紝鐢辫皟搴﹀崟妯″潡鏁版嵁鑷姩鍒ゆ柇
- */
- @Excel(name = "鏄惁鏈変换鍔★細0=鏄紝1=鍚︼紝鐢辫皟搴﹀崟妯″潡鏁版嵁鑷姩鍒ゆ柇")
- @TableField("has_task")
- private Integer hasTask;
-
-
- /**
- * 杞﹁締浣跨敤鐘舵�侊細0=绌洪棽锛�1=浣跨敤涓紝鐢辫皟搴﹀崟妯″潡鏁版嵁鑷姩鍒ゆ柇
- */
- @Excel(name = "杞﹁締浣跨敤鐘舵�侊細0=绌洪棽锛�1=浣跨敤涓紝鐢辫皟搴﹀崟妯″潡鏁版嵁鑷姩鍒ゆ柇")
- @TableField("vehicle_usage_status")
- private Integer vehicleUsageStatus;
-
-
- /**
- * 杞﹁韩棰滆壊
- */
- @TableField("body_color")
- private String bodyColor;
-
-
- /**
- * 杞︽灦鍙�
- */
- @TableField("frame_number")
- private String frameNumber;
-
-
- /**
- * 鍙戝姩鏈哄彿鐮�
- */
- @TableField("engine_number")
- private String engineNumber;
-
-
- /**
- * 鑳芥簮绫诲瀷
- */
- @TableField("energy_type")
- private String energyType;
-
-
- /**
- * 绌鸿浇娌硅�楋紙L/Km锛�
- */
- @TableField("empty_load_fuel")
- private BigDecimal emptyLoadFuel;
-
-
- /**
- * 閲嶈浇娌硅�楋紙L/Km锛�
- */
- @TableField("full_load_fuel")
- private BigDecimal fullLoadFuel;
-
-
- /**
- * 璐拱鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("purchase_date")
- private Date purchaseDate;
-
-
- /**
- * 杞﹁締璐疆浠凤紙涓囧厓锛�
- */
- @TableField("purchase_price")
- private BigDecimal purchasePrice;
-
-
- /**
- * 寮哄埗鎶ュ簾鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("mandatory_scrap_date")
- private Date mandatoryScrapDate;
-
-
- /**
- * 涓婃骞村鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("last_annual_inspection")
- private Date lastAnnualInspection;
-
-
- /**
- * 鍟嗕笟闄╂埅姝㈡棩鏈�
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("commercial_insurance_expiry")
- private Date commercialInsuranceExpiry;
-
-
- /**
- * 浜ゅ己闄╂埅姝㈡棩鏈�
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("traffic_insurance_expiry")
- private Date trafficInsuranceExpiry;
-
-
- /**
- * 瀹為檯闀匡紙mm锛�
- */
- @TableField("actual_length")
- private BigDecimal actualLength;
-
-
- /**
- * 瀹為檯瀹斤紙mm锛�
- */
- @TableField("actual_width")
- private BigDecimal actualWidth;
-
-
- /**
- * 瀹為檯楂橈紙mm锛�
- */
- @TableField("actual_height")
- private BigDecimal actualHeight;
-
-
- /**
- * 瑁呰浇浣撶Н锛坢鲁锛�
- */
- @TableField("load_volume")
- private BigDecimal loadVolume;
-
-
- /**
- * 瑁呰浇閲嶉噺锛圞g锛�
- */
- @TableField("load_weight")
- private BigDecimal loadWeight;
-
-
- /**
- * 鎺掓斁鏍囧噯
- */
- @TableField("emission_standard")
- private String emissionStandard;
-
-
- /**
- * 鍙戝姩鏈哄姛鐜�
- */
- @TableField("engine_power")
- private String enginePower;
-
-
- /**
- * 鐘舵�侊細0=姝ｅ父锛�1=鍋滅敤
- */
- @Excel(name = "鐘舵�侊細0=姝ｅ父锛�1=鍋滅敤")
- @TableField("status")
- private Integer status;
-
-
- /**
- * 鍒涘缓浜�
- */
- @TableField("create_by")
- private String createBy;
-
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("create_time")
- private Date createTime;
-
-
- /**
- * 鏇存柊浜�
- */
- @Excel(name = "鏇存柊浜�")
- @TableField("update_by")
- private String updateBy;
-
-
- /**
- * 鏇存柊鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @TableField("update_time")
- private Date updateTime;
-
-
- /**
- * 澶囨敞
- */
- @TableField("remark")
- private String remark;
-
- @TableField("carrier_type")
- private Integer carrierType;
-
- @TableField("settlement_id")
- private Integer settlementId;
-
- @TableField("settlement_name")
- private String settlementName;
- @TableField("car_key_no")
- private String carKeyNo;
-
-
-
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsVehicleDocument.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsVehicleDocument.java
deleted file mode 100644
index 2eb52d8..0000000
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsVehicleDocument.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.ruoyi.tms.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.util.Date;
-
-import lombok.Data;
-
-/**
- * 杞﹁締璇佷欢瀵硅薄 tms_vehicle_document
- *
- * @author ruoyi
- * @date 2025-11-04
- */
-@Data
-public class TmsVehicleDocument {
-
-
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /** 绯荤粺缂栧彿锛屾柊澧炴椂鑷姩濉啓 */
- @Excel(name = "绯荤粺缂栧彿")
- @TableField("system_code")
- private String systemCode;
-
- /** 杞﹁締ID */
- @Excel(name = "杞﹁締ID")
- @TableField("vehicle_id")
- private Integer vehicleId;
- /**
- * 杞︾墝鍙�
- */
- @Excel(name = "杞︾墝鍙�")
- @TableField("plate_number")
- private String plateNumber;
-
-
-
- //TODO
- @TableField("service_provider_id")
- private Integer serviceProviderId;
-
-
- @Excel(name = "杞﹁締鏈嶅姟鍟�")
- @TableField("service_provider_name")
- private String serviceProviderName;
-
-
- /**
- * 璇佷欢绫诲瀷
- */
- @Excel(name = "璇佷欢绫诲瀷")
- @TableField("certificate_type")
- private Integer certificateType;
-
-
- /**
- * 璇佷欢鍙�
- */
- @Excel(name = "璇佷欢鍙�")
- @TableField("certificate_number")
- private String certificateNumber;
-
-
- /**
- * 娉ㄥ唽鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "娉ㄥ唽鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @TableField("register_date")
- private Date registerDate;
-
-
- /**
- * 鍒版湡鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @TableField("expire_date")
- private Date expireDate;
-
-
- /**
- * 璇佷欢鍑瘉
- */
- @Excel(name = "璇佷欢鍑瘉")
- @TableField("certificate_file")
- private String certificateFile;
-
-
- /**
- * 涓婃骞村鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "涓婃骞村鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @TableField("last_annual_check_date")
- private Date lastAnnualCheckDate;
-
-
- /**
- * 搴熸鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "搴熸鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @TableField("invalid_date")
- private Date invalidDate;
-
-
- /**
- * 鐘舵��
- */
- @Excel(name = "鐘舵��")
- @TableField("status")
- private Integer status;
-
-
- /**
- * 鍒涘缓浜�
- */
- @TableField("create_by")
- private String createBy;
-
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("create_time")
- private Date createTime;
-
-
- /**
- * 鏇存柊浜�
- */
- @Excel(name = "鏇存柊浜�")
- @TableField("update_by")
- private String updateBy;
-
-
- /**
- * 鏇存柊鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @TableField("update_time")
- private Date updateTime;
-
-
- /**
- * 澶囨敞
- */
- @TableField("remark")
- private String remark;
-
-
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/mapper/TmsContainerMapper.java b/tms/src/main/java/com/ruoyi/tms/mapper/TmsContainerMapper.java
deleted file mode 100644
index 41c241e..0000000
--- a/tms/src/main/java/com/ruoyi/tms/mapper/TmsContainerMapper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.ruoyi.tms.mapper;
-
-import java.util.List;
-import com.ruoyi.tms.domain.TmsContainer;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 闆嗚绠辩鐞哅apper鎺ュ彛
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-public interface TmsContainerMapper extends BaseMapper<TmsContainer>
-{
- /**
- * 鏌ヨ闆嗚绠辩鐞�
- *
- * @param id 闆嗚绠辩鐞咺D
- * @return 闆嗚绠辩鐞�
- */
- public TmsContainer selectTmsContainerById(Integer id);
-
- /**
- * 鏌ヨ闆嗚绠辩鐞� 璁板綍鏁�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 闆嗚绠辩鐞嗛泦鍚�
- */
- public int selectTmsContainerCount(TmsContainer tmsContainer);
-
- /**
- * 鏌ヨ闆嗚绠辩鐞嗗垪琛�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 闆嗚绠辩鐞嗛泦鍚�
- */
- public List<TmsContainer> selectTmsContainerList(TmsContainer tmsContainer);
-
- /**
- * 鏂板闆嗚绠辩鐞�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- public int insertTmsContainer(TmsContainer tmsContainer);
-
- /**
- * 鏂板闆嗚绠辩鐞哰鎵归噺]
- *
- * @param tmsContainers 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- public int insertTmsContainerBatch(List<TmsContainer> tmsContainers);
-
- /**
- * 淇敼闆嗚绠辩鐞�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- public int updateTmsContainer(TmsContainer tmsContainer);
-
- /**
- * 淇敼闆嗚绠辩鐞哰鎵归噺]
- *
- * @param tmsContainers 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- public int updateTmsContainerBatch(List<TmsContainer> tmsContainers);
-
- /**
- * 鍒犻櫎闆嗚绠辩鐞�
- *
- * @param id 闆嗚绠辩鐞咺D
- * @return 缁撴灉
- */
- public int deleteTmsContainerById(Integer id);
-
- /**
- * 鎵归噺鍒犻櫎闆嗚绠辩鐞�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsContainerByIds(Integer[] ids);
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/mapper/TmsDispatchOrderMapper.java b/tms/src/main/java/com/ruoyi/tms/mapper/TmsDispatchOrderMapper.java
deleted file mode 100644
index ad3fffe..0000000
--- a/tms/src/main/java/com/ruoyi/tms/mapper/TmsDispatchOrderMapper.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.ruoyi.tms.mapper;
-
-import java.util.List;
-import com.ruoyi.tms.domain.TmsDispatchOrder;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.tms.domain.vo.DriverDispatchVo;
-
-
-/**
- * 璋冨害鍗曠鐞哅apper鎺ュ彛
- *
- * @author ruoyi
- * @date 2025-11-04
- */
-public interface TmsDispatchOrderMapper extends BaseMapper<TmsDispatchOrder>
-{
- /**
- * 鏌ヨ璋冨害鍗曠鐞�
- *
- * @param id 璋冨害鍗曠鐞咺D
- * @return 璋冨害鍗曠鐞�
- */
- public TmsDispatchOrder selectTmsDispatchOrderById(Integer id);
-
- /**
- * 鏌ヨ璋冨害鍗曠鐞� 璁板綍鏁�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 璋冨害鍗曠鐞嗛泦鍚�
- */
- public int selectTmsDispatchOrderCount(TmsDispatchOrder tmsDispatchOrder);
-
- /**
- * 鏌ヨ璋冨害鍗曠鐞嗗垪琛�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 璋冨害鍗曠鐞嗛泦鍚�
- */
- public List<TmsDispatchOrder> selectTmsDispatchOrderList(TmsDispatchOrder tmsDispatchOrder);
-
- /**
- * 鏂板璋冨害鍗曠鐞�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- public int insertTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
-
- /**
- * 鏂板璋冨害鍗曠鐞哰鎵归噺]
- *
- * @param tmsDispatchOrders 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- public int insertTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders);
-
- /**
- * 淇敼璋冨害鍗曠鐞�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- public int updateTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
-
- /**
- * 淇敼璋冨害鍗曠鐞哰鎵归噺]
- *
- * @param tmsDispatchOrders 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- public int updateTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders);
-
- /**
- * 鍒犻櫎璋冨害鍗曠鐞�
- *
- * @param id 璋冨害鍗曠鐞咺D
- * @return 缁撴灉
- */
- public int deleteTmsDispatchOrderById(Integer id);
-
- /**
- * 鎵归噺鍒犻櫎璋冨害鍗曠鐞�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsDispatchOrderByIds(Integer[] ids);
-
- public List<DriverDispatchVo> selectAssignedItineraryList(DriverDispatchVo vo);
- public DriverDispatchVo selectAssignedItineraryDetail(DriverDispatchVo vo);
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/mapper/TmsShelfMapper.java b/tms/src/main/java/com/ruoyi/tms/mapper/TmsShelfMapper.java
deleted file mode 100644
index f5b7389..0000000
--- a/tms/src/main/java/com/ruoyi/tms/mapper/TmsShelfMapper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.ruoyi.tms.mapper;
-
-import java.util.List;
-import com.ruoyi.tms.domain.TmsShelf;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 鎵樻灦绠＄悊Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-public interface TmsShelfMapper extends BaseMapper<TmsShelf>
-{
- /**
- * 鏌ヨ鎵樻灦绠＄悊
- *
- * @param id 鎵樻灦绠＄悊ID
- * @return 鎵樻灦绠＄悊
- */
- public TmsShelf selectTmsShelfById(Integer id);
-
- /**
- * 鏌ヨ鎵樻灦绠＄悊 璁板綍鏁�
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 鎵樻灦绠＄悊闆嗗悎
- */
- public int selectTmsShelfCount(TmsShelf tmsShelf);
-
- /**
- * 鏌ヨ鎵樻灦绠＄悊鍒楄〃
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 鎵樻灦绠＄悊闆嗗悎
- */
- public List<TmsShelf> selectTmsShelfList(TmsShelf tmsShelf);
-
- /**
- * 鏂板鎵樻灦绠＄悊
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- public int insertTmsShelf(TmsShelf tmsShelf);
-
- /**
- * 鏂板鎵樻灦绠＄悊[鎵归噺]
- *
- * @param tmsShelfs 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- public int insertTmsShelfBatch(List<TmsShelf> tmsShelfs);
-
- /**
- * 淇敼鎵樻灦绠＄悊
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- public int updateTmsShelf(TmsShelf tmsShelf);
-
- /**
- * 淇敼鎵樻灦绠＄悊[鎵归噺]
- *
- * @param tmsShelfs 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- public int updateTmsShelfBatch(List<TmsShelf> tmsShelfs);
-
- /**
- * 鍒犻櫎鎵樻灦绠＄悊
- *
- * @param id 鎵樻灦绠＄悊ID
- * @return 缁撴灉
- */
- public int deleteTmsShelfById(Integer id);
-
- /**
- * 鎵归噺鍒犻櫎鎵樻灦绠＄悊
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsShelfByIds(Integer[] ids);
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/mapper/TmsVehicleDocumentMapper.java b/tms/src/main/java/com/ruoyi/tms/mapper/TmsVehicleDocumentMapper.java
deleted file mode 100644
index 10d5d2a..0000000
--- a/tms/src/main/java/com/ruoyi/tms/mapper/TmsVehicleDocumentMapper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.ruoyi.tms.mapper;
-
-import java.util.List;
-import com.ruoyi.tms.domain.TmsVehicleDocument;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 杞﹁締璇佷欢Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2025-11-04
- */
-public interface TmsVehicleDocumentMapper extends BaseMapper<TmsVehicleDocument>
-{
- /**
- * 鏌ヨ杞﹁締璇佷欢
- *
- * @param systemId 杞﹁締璇佷欢ID
- * @return 杞﹁締璇佷欢
- */
- public TmsVehicleDocument selectTmsVehicleDocumentById(Integer id);
-
- /**
- * 鏌ヨ杞﹁締璇佷欢 璁板綍鏁�
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 杞﹁締璇佷欢闆嗗悎
- */
- public int selectTmsVehicleDocumentCount(TmsVehicleDocument tmsVehicleDocument);
-
- /**
- * 鏌ヨ杞﹁締璇佷欢鍒楄〃
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 杞﹁締璇佷欢闆嗗悎
- */
- public List<TmsVehicleDocument> selectTmsVehicleDocumentList(TmsVehicleDocument tmsVehicleDocument);
-
- /**
- * 鏂板杞﹁締璇佷欢
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- public int insertTmsVehicleDocument(TmsVehicleDocument tmsVehicleDocument);
-
- /**
- * 鏂板杞﹁締璇佷欢[鎵归噺]
- *
- * @param tmsVehicleDocuments 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- public int insertTmsVehicleDocumentBatch(List<TmsVehicleDocument> tmsVehicleDocuments);
-
- /**
- * 淇敼杞﹁締璇佷欢
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- public int updateTmsVehicleDocument(TmsVehicleDocument tmsVehicleDocument);
-
- /**
- * 淇敼杞﹁締璇佷欢[鎵归噺]
- *
- * @param tmsVehicleDocuments 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- public int updateTmsVehicleDocumentBatch(List<TmsVehicleDocument> tmsVehicleDocuments);
-
- /**
- * 鍒犻櫎杞﹁締璇佷欢
- *
- * @param systemId 杞﹁締璇佷欢ID
- * @return 缁撴灉
- */
- public int deleteTmsVehicleDocumentById(Integer id);
-
- /**
- * 鎵归噺鍒犻櫎杞﹁締璇佷欢
- *
- * @param systemIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsVehicleDocumentByIds(Integer[] ids);
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/mapper/TmsVehicleMapper.java b/tms/src/main/java/com/ruoyi/tms/mapper/TmsVehicleMapper.java
deleted file mode 100644
index 79cbdb7..0000000
--- a/tms/src/main/java/com/ruoyi/tms/mapper/TmsVehicleMapper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.ruoyi.tms.mapper;
-
-import java.util.List;
-import com.ruoyi.tms.domain.TmsVehicle;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 杞﹁締绠＄悊Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-public interface TmsVehicleMapper extends BaseMapper<TmsVehicle>
-{
- /**
- * 鏌ヨ杞﹁締绠＄悊
- *
- * @param id 杞﹁締绠＄悊ID
- * @return 杞﹁締绠＄悊
- */
- public TmsVehicle selectTmsVehicleById(Integer id);
-
- /**
- * 鏌ヨ杞﹁締绠＄悊 璁板綍鏁�
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 杞﹁締绠＄悊闆嗗悎
- */
- public int selectTmsVehicleCount(TmsVehicle tmsVehicle);
-
- /**
- * 鏌ヨ杞﹁締绠＄悊鍒楄〃
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 杞﹁締绠＄悊闆嗗悎
- */
- public List<TmsVehicle> selectTmsVehicleList(TmsVehicle tmsVehicle);
-
- /**
- * 鏂板杞﹁締绠＄悊
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- public int insertTmsVehicle(TmsVehicle tmsVehicle);
-
- /**
- * 鏂板杞﹁締绠＄悊[鎵归噺]
- *
- * @param tmsVehicles 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- public int insertTmsVehicleBatch(List<TmsVehicle> tmsVehicles);
-
- /**
- * 淇敼杞﹁締绠＄悊
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- public int updateTmsVehicle(TmsVehicle tmsVehicle);
-
- /**
- * 淇敼杞﹁締绠＄悊[鎵归噺]
- *
- * @param tmsVehicles 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- public int updateTmsVehicleBatch(List<TmsVehicle> tmsVehicles);
-
- /**
- * 鍒犻櫎杞﹁締绠＄悊
- *
- * @param id 杞﹁締绠＄悊ID
- * @return 缁撴灉
- */
- public int deleteTmsVehicleById(Integer id);
-
- /**
- * 鎵归噺鍒犻櫎杞﹁締绠＄悊
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsVehicleByIds(Integer[] ids);
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/ITmsContainerService.java b/tms/src/main/java/com/ruoyi/tms/service/ITmsContainerService.java
deleted file mode 100644
index 85e0aa5..0000000
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsContainerService.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.ruoyi.tms.service;
-
-import java.util.List;
-import com.ruoyi.tms.domain.TmsContainer;
-import com.baomidou.mybatisplus.extension.service.IService;
-/**
- * 闆嗚绠辩鐞哠ervice鎺ュ彛
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-public interface ITmsContainerService extends IService<TmsContainer>
-{
- /**
- * 鏌ヨ闆嗚绠辩鐞�
- *
- * @param id 闆嗚绠辩鐞咺D
- * @return 闆嗚绠辩鐞�
- */
- public TmsContainer selectTmsContainerById(Integer id);
-
- /**
- * 鏌ヨ闆嗚绠辩鐞� 璁板綍鏁�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 闆嗚绠辩鐞嗛泦鍚�
- */
- public int selectTmsContainerCount(TmsContainer tmsContainer);
-
- /**
- * 鏌ヨ闆嗚绠辩鐞嗗垪琛�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 闆嗚绠辩鐞嗛泦鍚�
- */
- public List<TmsContainer> selectTmsContainerList(TmsContainer tmsContainer);
-
- /**
- * 鏌ヨ闆嗚绠辩鐞嗗垪琛� 寮傛 瀵煎嚭
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
- * @return 闆嗚绠辩鐞嗛泦鍚�
- */
- public void export(TmsContainer tmsContainer, String exportKey) ;
-
-
- /**
- * 鏂板闆嗚绠辩鐞�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- public int insertTmsContainer(TmsContainer tmsContainer);
-
- /**
- * 鏂板闆嗚绠辩鐞哰鎵归噺]
- *
- * @param tmsContainers 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- public int insertTmsContainerBatch(List<TmsContainer> tmsContainers);
-
- /**
- * 淇敼闆嗚绠辩鐞�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- public int updateTmsContainer(TmsContainer tmsContainer);
-
- /**
- * 淇敼闆嗚绠辩鐞哰鎵归噺]
- *
- * @param tmsContainers 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- public int updateTmsContainerBatch(List<TmsContainer> tmsContainers);
- /**
- * 鎵归噺鍒犻櫎闆嗚绠辩鐞�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsContainerByIds(String ids);
-
- /**
- * 鎵归噺鍒犻櫎闆嗚绠辩鐞�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsContainerByIds(Integer[] ids);
-
- /**
- * 鍒犻櫎闆嗚绠辩鐞嗕俊鎭�
- *
- * @param id 闆嗚绠辩鐞咺D
- * @return 缁撴灉
- */
- public int deleteTmsContainerById(Integer id);
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
deleted file mode 100644
index 6acd6c1..0000000
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.ruoyi.tms.service;
-
-import java.util.List;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.tms.domain.TmsDispatchOrder;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.tms.domain.TmsDriverDispatch;
-
-/**
- * 璋冨害鍗曠鐞哠ervice鎺ュ彛
- *
- * @author ruoyi
- * @date 2025-11-04
- */
-public interface ITmsDispatchOrderService extends IService<TmsDispatchOrder>
-{
- /**
- * 鏌ヨ璋冨害鍗曠鐞�
- *
- * @param id 璋冨害鍗曠鐞咺D
- * @return 璋冨害鍗曠鐞�
- */
- public TmsDispatchOrder selectTmsDispatchOrderById(Integer id);
- public AjaxResult confirmOrder(Integer id);
- public AjaxResult copyOrder(Integer id);
- public AjaxResult okOrder(Integer id);
- public AjaxResult dropHook(Integer id);
- public AjaxResult connectHang(TmsDriverDispatch driverDispatch);
- public int customsOrder(TmsDispatchOrder tmsDispatchOrder);
- public int loadingOrder(TmsDispatchOrder tmsDispatchOrder);
-
-
- /**
- * 琚寚娲捐绋嬪垪琛�
- * @return
- */
- public AjaxResult assignedItineraryList();
- public AjaxResult assignedItineraryLogList();
- public AjaxResult selectAssignedItineraryDetail(Integer dispatchId);
-
- /**
- * 鏌ヨ璋冨害鍗曠鐞� 璁板綍鏁�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 璋冨害鍗曠鐞嗛泦鍚�
- */
- public int selectTmsDispatchOrderCount(TmsDispatchOrder tmsDispatchOrder);
-
- /**
- * 鏌ヨ璋冨害鍗曠鐞嗗垪琛�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 璋冨害鍗曠鐞嗛泦鍚�
- */
- public List<TmsDispatchOrder> selectTmsDispatchOrderList(TmsDispatchOrder tmsDispatchOrder);
-
- /**
- * 鏌ヨ璋冨害鍗曠鐞嗗垪琛� 寮傛 瀵煎嚭
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
- * @return 璋冨害鍗曠鐞嗛泦鍚�
- */
- public void export(TmsDispatchOrder tmsDispatchOrder, String exportKey) ;
-
-
- /**
- * 鏂板璋冨害鍗曠鐞�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- public int insertTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
-
- /**
- * 鏂板璋冨害鍗曠鐞哰鎵归噺]
- *
- * @param tmsDispatchOrders 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- public int insertTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders);
-
- /**
- * 淇敼璋冨害鍗曠鐞�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- public int updateTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
-
- /**
- * 淇敼璋冨害鍗曠鐞哰鎵归噺]
- *
- * @param tmsDispatchOrders 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- public int updateTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders);
- /**
- * 鎵归噺鍒犻櫎璋冨害鍗曠鐞�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsDispatchOrderByIds(String ids);
-
- /**
- * 鎵归噺鍒犻櫎璋冨害鍗曠鐞�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsDispatchOrderByIds(Integer[] ids);
-
-
- /**
- * 鍒犻櫎璋冨害鍗曠鐞嗕俊鎭�
- *
- * @param id 璋冨害鍗曠鐞咺D
- * @return 缁撴灉
- */
- public int deleteTmsDispatchOrderById(Integer id);
-
-
- public List<TmsDispatchOrder> initGenerate(List<Integer> ids);
- public AjaxResult generateTmsDispatchOrder(List<Integer> ids);
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/ITmsShelfService.java b/tms/src/main/java/com/ruoyi/tms/service/ITmsShelfService.java
deleted file mode 100644
index 01ab589..0000000
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsShelfService.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.ruoyi.tms.service;
-
-import java.util.List;
-import com.ruoyi.tms.domain.TmsShelf;
-import com.baomidou.mybatisplus.extension.service.IService;
-/**
- * 鎵樻灦绠＄悊Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-public interface ITmsShelfService extends IService<TmsShelf>
-{
- /**
- * 鏌ヨ鎵樻灦绠＄悊
- *
- * @param id 鎵樻灦绠＄悊ID
- * @return 鎵樻灦绠＄悊
- */
- public TmsShelf selectTmsShelfById(Integer id);
-
- /**
- * 鏌ヨ鎵樻灦绠＄悊 璁板綍鏁�
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 鎵樻灦绠＄悊闆嗗悎
- */
- public int selectTmsShelfCount(TmsShelf tmsShelf);
-
- /**
- * 鏌ヨ鎵樻灦绠＄悊鍒楄〃
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 鎵樻灦绠＄悊闆嗗悎
- */
- public List<TmsShelf> selectTmsShelfList(TmsShelf tmsShelf);
-
- /**
- * 鏌ヨ鎵樻灦绠＄悊鍒楄〃 寮傛 瀵煎嚭
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
- * @return 鎵樻灦绠＄悊闆嗗悎
- */
- public void export(TmsShelf tmsShelf, String exportKey) ;
-
-
- /**
- * 鏂板鎵樻灦绠＄悊
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- public int insertTmsShelf(TmsShelf tmsShelf);
-
- /**
- * 鏂板鎵樻灦绠＄悊[鎵归噺]
- *
- * @param tmsShelfs 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- public int insertTmsShelfBatch(List<TmsShelf> tmsShelfs);
-
- /**
- * 淇敼鎵樻灦绠＄悊
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- public int updateTmsShelf(TmsShelf tmsShelf);
-
- /**
- * 淇敼鎵樻灦绠＄悊[鎵归噺]
- *
- * @param tmsShelfs 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- public int updateTmsShelfBatch(List<TmsShelf> tmsShelfs);
- /**
- * 鎵归噺鍒犻櫎鎵樻灦绠＄悊
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsShelfByIds(String ids);
-
- /**
- * 鎵归噺鍒犻櫎鎵樻灦绠＄悊
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsShelfByIds(Integer[] ids);
-
- /**
- * 鍒犻櫎鎵樻灦绠＄悊淇℃伅
- *
- * @param id 鎵樻灦绠＄悊ID
- * @return 缁撴灉
- */
- public int deleteTmsShelfById(Integer id);
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/ITmsVehicleDocumentService.java b/tms/src/main/java/com/ruoyi/tms/service/ITmsVehicleDocumentService.java
deleted file mode 100644
index 47d35de..0000000
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsVehicleDocumentService.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.ruoyi.tms.service;
-
-import java.util.List;
-import com.ruoyi.tms.domain.TmsVehicleDocument;
-import com.baomidou.mybatisplus.extension.service.IService;
-/**
- * 杞﹁締璇佷欢Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2025-11-04
- */
-public interface ITmsVehicleDocumentService extends IService<TmsVehicleDocument>
-{
- /**
- * 鏌ヨ杞﹁締璇佷欢
- *
- * @param systemId 杞﹁締璇佷欢ID
- * @return 杞﹁締璇佷欢
- */
- public TmsVehicleDocument selectTmsVehicleDocumentById(Integer id);
-
- /**
- * 鏌ヨ杞﹁締璇佷欢 璁板綍鏁�
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 杞﹁締璇佷欢闆嗗悎
- */
- public int selectTmsVehicleDocumentCount(TmsVehicleDocument tmsVehicleDocument);
-
- /**
- * 鏌ヨ杞﹁締璇佷欢鍒楄〃
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 杞﹁締璇佷欢闆嗗悎
- */
- public List<TmsVehicleDocument> selectTmsVehicleDocumentList(TmsVehicleDocument tmsVehicleDocument);
-
- /**
- * 鏌ヨ杞﹁締璇佷欢鍒楄〃 寮傛 瀵煎嚭
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
- * @return 杞﹁締璇佷欢闆嗗悎
- */
- public void export(TmsVehicleDocument tmsVehicleDocument, String exportKey) ;
-
-
- /**
- * 鏂板杞﹁締璇佷欢
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- public int insertTmsVehicleDocument(TmsVehicleDocument tmsVehicleDocument);
-
- /**
- * 鏂板杞﹁締璇佷欢[鎵归噺]
- *
- * @param tmsVehicleDocuments 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- public int insertTmsVehicleDocumentBatch(List<TmsVehicleDocument> tmsVehicleDocuments);
-
- /**
- * 淇敼杞﹁締璇佷欢
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- public int updateTmsVehicleDocument(TmsVehicleDocument tmsVehicleDocument);
-
- /**
- * 淇敼杞﹁締璇佷欢[鎵归噺]
- *
- * @param tmsVehicleDocuments 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- public int updateTmsVehicleDocumentBatch(List<TmsVehicleDocument> tmsVehicleDocuments);
- /**
- * 鎵归噺鍒犻櫎杞﹁締璇佷欢
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsVehicleDocumentByIds(String ids);
-
- /**
- * 鎵归噺鍒犻櫎杞﹁締璇佷欢
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsVehicleDocumentByIds(Integer[] ids);
-
- /**
- * 鍒犻櫎杞﹁締璇佷欢淇℃伅
- *
- * @param systemId 杞﹁締璇佷欢ID
- * @return 缁撴灉
- */
- public int deleteTmsVehicleDocumentById(Integer id);
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/ITmsVehicleService.java b/tms/src/main/java/com/ruoyi/tms/service/ITmsVehicleService.java
deleted file mode 100644
index 7610cce..0000000
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsVehicleService.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.ruoyi.tms.service;
-
-import java.util.List;
-import com.ruoyi.tms.domain.TmsVehicle;
-import com.baomidou.mybatisplus.extension.service.IService;
-/**
- * 杞﹁締绠＄悊Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-public interface ITmsVehicleService extends IService<TmsVehicle>
-{
- /**
- * 鏌ヨ杞﹁締绠＄悊
- *
- * @param id 杞﹁締绠＄悊ID
- * @return 杞﹁締绠＄悊
- */
- public TmsVehicle selectTmsVehicleById(Integer id);
-
- /**
- * 鏌ヨ杞﹁締绠＄悊 璁板綍鏁�
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 杞﹁締绠＄悊闆嗗悎
- */
- public int selectTmsVehicleCount(TmsVehicle tmsVehicle);
-
- /**
- * 鏌ヨ杞﹁締绠＄悊鍒楄〃
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 杞﹁締绠＄悊闆嗗悎
- */
- public List<TmsVehicle> selectTmsVehicleList(TmsVehicle tmsVehicle);
-
- /**
- * 鏌ヨ杞﹁締绠＄悊鍒楄〃 寮傛 瀵煎嚭
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
- * @return 杞﹁締绠＄悊闆嗗悎
- */
- public void export(TmsVehicle tmsVehicle, String exportKey) ;
-
-
- /**
- * 鏂板杞﹁締绠＄悊
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- public int insertTmsVehicle(TmsVehicle tmsVehicle);
-
- /**
- * 鏂板杞﹁締绠＄悊[鎵归噺]
- *
- * @param tmsVehicles 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- public int insertTmsVehicleBatch(List<TmsVehicle> tmsVehicles);
-
- /**
- * 淇敼杞﹁締绠＄悊
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- public int updateTmsVehicle(TmsVehicle tmsVehicle);
-
- /**
- * 淇敼杞﹁締绠＄悊[鎵归噺]
- *
- * @param tmsVehicles 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- public int updateTmsVehicleBatch(List<TmsVehicle> tmsVehicles);
- /**
- * 鎵归噺鍒犻櫎杞﹁締绠＄悊
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsVehicleByIds(String ids);
-
- /**
- * 鎵归噺鍒犻櫎杞﹁締绠＄悊
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteTmsVehicleByIds(Integer[] ids);
-
- /**
- * 鍒犻櫎杞﹁締绠＄悊淇℃伅
- *
- * @param id 杞﹁締绠＄悊ID
- * @return 缁撴灉
- */
- public int deleteTmsVehicleById(Integer id);
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsContainerServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsContainerServiceImpl.java
deleted file mode 100644
index ca3e68d..0000000
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsContainerServiceImpl.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.ruoyi.tms.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.common.enums.SystemDataNoEnum;
-import com.ruoyi.common.utils.DateUtils;
-import javax.annotation.Resource;
-
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.service.ISystemDataNoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.stereotype.Service;
-import org.springframework.scheduling.annotation.Async;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.common.core.service.BaseService;
-
-import com.ruoyi.tms.mapper.TmsContainerMapper;
-import com.ruoyi.tms.domain.TmsContainer;
-import com.ruoyi.tms.service.ITmsContainerService;
-import com.ruoyi.common.core.text.Convert;
-
-/**
- * 闆嗚绠辩鐞哠ervice涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class TmsContainerServiceImpl extends BaseService<TmsContainerMapper, TmsContainer> implements ITmsContainerService
-{
- protected final Logger logger = LoggerFactory.getLogger(getClass());
- @Resource
- private TmsContainerMapper tmsContainerMapper;
- @Autowired
- ISystemDataNoService systemDataNoService;
-
- /**
- * 鏌ヨ闆嗚绠辩鐞�
- *
- * @param id 闆嗚绠辩鐞咺D
- * @return 闆嗚绠辩鐞�
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public TmsContainer selectTmsContainerById(Integer id)
- {
- return tmsContainerMapper.selectTmsContainerById(id);
- }
-
- /**
- * 鏌ヨ闆嗚绠辩鐞� 璁板綍鏁�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 闆嗚绠辩鐞嗛泦鍚�
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public int selectTmsContainerCount(TmsContainer tmsContainer)
- {
- return tmsContainerMapper.selectTmsContainerCount(tmsContainer);
- }
-
- /**
- * 鏌ヨ闆嗚绠辩鐞嗗垪琛�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 闆嗚绠辩鐞�
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public List<TmsContainer> selectTmsContainerList(TmsContainer tmsContainer)
- {
- return tmsContainerMapper.selectTmsContainerList(tmsContainer);
- }
-
- /**
- * 鏌ヨ闆嗚绠辩鐞嗗垪琛� 寮傛 瀵煎嚭
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
- * @return 闆嗚绠辩鐞嗛泦鍚�
- */
- @DataSource(DataSourceType.SLAVE)
- @Async
- @Override
- public void export(TmsContainer tmsContainer,String exportKey) {
-
- super.export(TmsContainer.class,exportKey,"tmsContainerData",(pageNum)->{
- PageUtils.startPage(pageNum, Constants.EXPORT_PATE_SIZE);
- return selectTmsContainerList(tmsContainer);
- });
- }
-
-
- /**
- * 鏂板闆嗚绠辩鐞�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- @Override
- public int insertTmsContainer(TmsContainer tmsContainer)
- {
- tmsContainer.setSystemCode(systemDataNoService.getNoByKey(SystemDataNoEnum.XH));
-
- tmsContainer.setCreateBy(SecurityUtils.getUsername());
- tmsContainer.setCreateTime(DateUtils.getNowDate());
- return tmsContainerMapper.insertTmsContainer(tmsContainer);
- }
-
- /**
- * 鏂板闆嗚绠辩鐞哰鎵归噺]
- *
- * @param tmsContainers 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- @Override
- public int insertTmsContainerBatch(List<TmsContainer> tmsContainers)
- {
- int rows = tmsContainerMapper.insertTmsContainerBatch(tmsContainers);
- return rows;
- }
-
- /**
- * 淇敼闆嗚绠辩鐞�
- *
- * @param tmsContainer 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- @Override
- public int updateTmsContainer(TmsContainer tmsContainer)
- {
- tmsContainer.setUpdateBy(SecurityUtils.getUsername());
- tmsContainer.setUpdateTime(DateUtils.getNowDate());
- return tmsContainerMapper.updateTmsContainer(tmsContainer);
- }
-
- /**
- * 淇敼闆嗚绠辩鐞哰鎵归噺]
- *
- * @param tmsContainers 闆嗚绠辩鐞�
- * @return 缁撴灉
- */
- @Override
- public int updateTmsContainerBatch(List<TmsContainer> tmsContainers){
- return tmsContainerMapper.updateTmsContainerBatch(tmsContainers);
- }
-
- /**
- * 鍒犻櫎闆嗚绠辩鐞嗗璞�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsContainerByIds(String ids)
- {
- return deleteTmsContainerByIds(Convert.toIntArray(ids));
- }
-
- /**
- * 鍒犻櫎闆嗚绠辩鐞嗗璞�
- *
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsContainerByIds(Integer[] ids)
- {
- return tmsContainerMapper.deleteTmsContainerByIds(ids);
- }
-
- /**
- * 鍒犻櫎闆嗚绠辩鐞嗕俊鎭�
- *
- * @param id 闆嗚绠辩鐞咺D
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsContainerById(Integer id)
- {
- return tmsContainerMapper.deleteTmsContainerById(id);
- }
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsCustomerInfoServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsCustomerInfoServiceImpl.java
index 6d97e25..4391324 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsCustomerInfoServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsCustomerInfoServiceImpl.java
@@ -19,6 +19,8 @@
import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.common.core.service.BaseService;
+import com.ruoyi.cwgl.service.IBankAccountConfigService;
+import com.ruoyi.cwgl.service.IInvoiceInfoService;
import com.ruoyi.tms.mapper.TmsCustomerInfoMapper;
import com.ruoyi.tms.domain.TmsCustomerInfo;
import com.ruoyi.tms.service.ITmsCustomerInfoService;
@@ -39,6 +41,12 @@
private TmsCustomerInfoMapper tmsCustomerInfoMapper;
@Autowired
ISystemDataNoService systemDataNoService;
+
+ @Autowired
+ IInvoiceInfoService invoiceInfoService;
+
+ @Autowired
+ IBankAccountConfigService bankAccountConfigService;
/**
* 鏌ヨ瀹㈡埛淇℃伅
@@ -109,7 +117,33 @@
{
tmsCustomerInfo.setCustomerCode(systemDataNoService.getNoByKey(SystemDataNoEnum.CUST));
tmsCustomerInfo.setCreateTime(DateUtils.getNowDate());
- return tmsCustomerInfoMapper.insertTmsCustomerInfo(tmsCustomerInfo);
+
+ // 淇濆瓨瀹㈡埛淇℃伅
+ int result = tmsCustomerInfoMapper.insertTmsCustomerInfo(tmsCustomerInfo);
+
+ // 鑾峰彇瀹㈡埛ID鍜屽鎴峰悕绉�
+ Integer customerId = tmsCustomerInfo.getId();
+ String customerName = tmsCustomerInfo.getCustomerFullName();
+
+ // 淇濆瓨鍙戠エ淇℃伅鍒楄〃
+ if (tmsCustomerInfo.getInvoiceInfoList() != null && !tmsCustomerInfo.getInvoiceInfoList().isEmpty()) {
+ tmsCustomerInfo.getInvoiceInfoList().forEach(invoiceInfo -> {
+ invoiceInfo.setCustomerId(customerId);
+ invoiceInfo.setCustomerName(customerName);
+ });
+ invoiceInfoService.insertInvoiceInfoBatch(tmsCustomerInfo.getInvoiceInfoList());
+ }
+
+ // 淇濆瓨閾惰璐﹀彿閰嶇疆鍒楄〃
+ if (tmsCustomerInfo.getBankAccountConfigList() != null && !tmsCustomerInfo.getBankAccountConfigList().isEmpty()) {
+ tmsCustomerInfo.getBankAccountConfigList().forEach(bankAccountConfig -> {
+ bankAccountConfig.setCustomerId(customerId);
+ bankAccountConfig.setCustomerName(customerName);
+ });
+ bankAccountConfigService.insertBankAccountConfigBatch(tmsCustomerInfo.getBankAccountConfigList());
+ }
+
+ return result;
}
/**
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
deleted file mode 100644
index 47eecb5..0000000
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
+++ /dev/null
@@ -1,577 +0,0 @@
-package com.ruoyi.tms.service.impl;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.enums.SystemDataNoEnum;
-import com.ruoyi.common.utils.DateUtils;
-import javax.annotation.Resource;
-
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.ISystemDataNoService;
-import com.ruoyi.tms.domain.*;
-import com.ruoyi.tms.domain.vo.DriverDispatchVo;
-import com.ruoyi.tms.mapper.TmsFinanceMapper;
-import com.ruoyi.tms.mapper.TmsQuoteDetailMapper;
-import com.ruoyi.tms.mapper.TmsQuotePlanMapper;
-import com.ruoyi.tms.service.ITmsDriverDispatchService;
-import com.ruoyi.tms.service.ITmsFinanceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.stereotype.Service;
-import org.springframework.scheduling.annotation.Async;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.common.core.service.BaseService;
-
-import com.ruoyi.tms.mapper.TmsDispatchOrderMapper;
-import com.ruoyi.tms.service.ITmsDispatchOrderService;
-import com.ruoyi.common.core.text.Convert;
-
-/**
- * 璋冨害鍗曠鐞哠ervice涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2025-11-04
- */
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class TmsDispatchOrderServiceImpl extends BaseService<TmsDispatchOrderMapper, TmsDispatchOrder> implements ITmsDispatchOrderService
-{
- protected final Logger logger = LoggerFactory.getLogger(getClass());
- @Resource
- private TmsDispatchOrderMapper tmsDispatchOrderMapper;
- @Autowired
- ISystemDataNoService systemDataNoService;
- @Autowired
- private ISysUserService userService;
- @Autowired
- private ITmsDriverDispatchService tmsDriverDispatchService;
- @Resource
- private TmsQuoteDetailMapper tmsQuoteDetailMapper;
-
- @Resource
- private TmsQuotePlanMapper tmsQuotePlanMapper;
-
-
- @Autowired
- ITmsFinanceService tmsFinanceService;
- /**
- * 鏌ヨ璋冨害鍗曠鐞�
- *
- * @param id 璋冨害鍗曠鐞咺D
- * @return 璋冨害鍗曠鐞�
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public TmsDispatchOrder selectTmsDispatchOrderById(Integer id)
- {
- return tmsDispatchOrderMapper.selectTmsDispatchOrderById(id);
- }
-
- @Override
- public AjaxResult confirmOrder(Integer id) {
- TmsDispatchOrder tmsDispatchOrder = selectTmsDispatchOrderById(id);
- if (tmsDispatchOrder == null){
- return AjaxResult.error("鏈壘鍒拌鏁版嵁");
- }
- if (tmsDispatchOrder.getStatus() != 0){
- return AjaxResult.error("璇ヨ皟搴﹀崟鏁版嵁鐘舵�佸紓甯�");
- }
- if (tmsDispatchOrder.getMainDriverId() == null){
- return AjaxResult.error("璇峰厛閫夋嫨涓婚┚鍙告満");
- }
- if (tmsDispatchOrder.getVehicleId() == null){
- return AjaxResult.error("璇峰厛閫夋嫨杞﹁締");
- }
- tmsDispatchOrder.setConfirmTime(DateUtils.getNowDate());
- tmsDispatchOrder.setStatus(1);
-
- tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
- int i = tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
- TmsDriverDispatch tmsDriverDispatch = new TmsDriverDispatch();
- tmsDriverDispatch.setDriverId(tmsDispatchOrder.getMainDriverId());
- tmsDriverDispatch.setDispatchId(tmsDispatchOrder.getId());
- tmsDriverDispatch.setStatus(0);
- tmsDriverDispatchService.insertTmsDriverDispatch(tmsDriverDispatch);
- if (i > 0){
- return AjaxResult.success("鎿嶄綔鎴愬姛");
- }
- return AjaxResult.error("鎿嶄綔澶辫触");
- }
- @Override
- public AjaxResult okOrder(Integer id) {
- TmsDispatchOrder tmsDispatchOrder = selectTmsDispatchOrderById(id);
- if (tmsDispatchOrder == null){
- return AjaxResult.error("鏈壘鍒拌鏁版嵁");
- }
- if (tmsDispatchOrder.getStatus() != 2){
- return AjaxResult.error("璇ヨ皟搴﹀崟鏁版嵁鐘舵�佸紓甯�");
- }
- tmsDispatchOrder.setStatus(3);
- tmsDispatchOrder.setOkTime(DateUtils.getNowDate());
- tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
- int i = tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
- if (i > 0){
- return AjaxResult.success("鎿嶄綔鎴愬姛");
- }
- return AjaxResult.error("鎿嶄綔澶辫触");
- }
- @Override
- public AjaxResult copyOrder(Integer id) {
- TmsDispatchOrder tmsDispatchOrder = selectTmsDispatchOrderById(id);
- if (tmsDispatchOrder == null){
- return AjaxResult.error("鏈壘鍒拌鏁版嵁");
- }
- TmsDispatchOrder tmsDispatchOrderNew = BeanUtil.copyProperties(tmsDispatchOrder, TmsDispatchOrder.class);
-
- tmsDispatchOrderNew.setStatus(0);
- tmsDispatchOrderNew.setMainDriverId(null);
- tmsDispatchOrderNew.setMainDriverName(null);
- tmsDispatchOrderNew.setAssistantDriverId(null);
- tmsDispatchOrderNew.setAssistantDriverName(null);
- tmsDispatchOrderNew.setVehicleId(null);
- tmsDispatchOrderNew.setLicensePlate(null);
- tmsDispatchOrderNew.setUpdateBy(null);
- tmsDispatchOrderNew.setId(null);
-
-
- int i = insertTmsDispatchOrder(tmsDispatchOrderNew);
- if (i > 0){
- return AjaxResult.success("鎿嶄綔鎴愬姛");
- }
- return AjaxResult.error("鎿嶄綔澶辫触");
- }
-
- @Override
- public AjaxResult dropHook(Integer id) {
- TmsDispatchOrder tmsDispatchOrder = selectTmsDispatchOrderById(id);
- if (tmsDispatchOrder == null){
- return AjaxResult.error("鏈壘鍒拌鏁版嵁");
- }
- tmsDriverDispatchService.update(
- null,
- new LambdaUpdateWrapper<TmsDriverDispatch>()
- .eq(TmsDriverDispatch::getDispatchId, tmsDispatchOrder.getId())
- .eq(TmsDriverDispatch::getDriverId, tmsDispatchOrder.getMainDriverId())
- .set(TmsDriverDispatch::getStatus, 1)
- );
-
- tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
- .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
- .set(TmsDispatchOrder::getStatus, 6)
- );
- return AjaxResult.success("鎿嶄綔鎴愬姛");
- }
-
-
- @Override
- public AjaxResult connectHang(TmsDriverDispatch driverDispatch) {
- TmsDispatchOrder tmsDispatchOrder = selectTmsDispatchOrderById(driverDispatch.getDispatchId());
- if (tmsDispatchOrder == null){
- return AjaxResult.error("鏈壘鍒拌鏁版嵁");
- }
- driverDispatch.setStatus(2);
- tmsDriverDispatchService.insertTmsDriverDispatch(driverDispatch);
- return AjaxResult.success();
- }
-
-
- @Override
- public int customsOrder(TmsDispatchOrder tmsDispatchOrder) {
- return tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
- .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
- .set(TmsDispatchOrder::getCustomsServiceProviderId, tmsDispatchOrder.getCustomsServiceProviderId())
- .set(TmsDispatchOrder::getCustomsServiceProviderName, tmsDispatchOrder.getCustomsServiceProviderName())
- );
-
- }
-
- @Override
- public int loadingOrder(TmsDispatchOrder tmsDispatchOrder) {
- return tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
- .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
- .set(TmsDispatchOrder::getLoadingServiceProviderId, tmsDispatchOrder.getLoadingServiceProviderId())
- .set(TmsDispatchOrder::getLoadingServiceProviderName, tmsDispatchOrder.getLoadingServiceProviderName())
- );
- }
-
- @Override
- public AjaxResult assignedItineraryList() {
- Integer deviceId = userService.getDeviceId(SecurityUtils.getUserId());
- if (deviceId == null){
- return AjaxResult.success();
- }
-
- DriverDispatchVo vo = new DriverDispatchVo();
- vo.setDriverId(deviceId);
- vo.setInStatusList(Arrays.asList(0, 1, 2,4));
- vo.setInTdoStatusList(Arrays.asList(1, 2));
- List<DriverDispatchVo> driverDispatchVos = tmsDispatchOrderMapper.selectAssignedItineraryList(vo);
- if (driverDispatchVos != null && !driverDispatchVos.isEmpty()){
- driverDispatchVos.forEach(item ->{
- if (item.getTddStatus() == 1 ){
- item.setStatusStr("寰呯敥鎸�");
- }else if (item.getTddStatus() == 2){
- item.setStatusStr("寰呮帴鎸�");
- }else if (item.getStatus() == 1){
- item.setStatusStr("寰呭彂杞�");
- }else if (item.getStatus() == 2){
- item.setStatusStr("鍦ㄩ��");
- }else {
- item.setStatusStr("瀹屾垚琛岀▼");
- }
- });
- }
-
-
- return AjaxResult.success(driverDispatchVos);
- }
- @Override
- public AjaxResult assignedItineraryLogList() {
- Integer deviceId = userService.getDeviceId(SecurityUtils.getUserId());
- if (deviceId == null){
- return AjaxResult.success();
- }
-
- DriverDispatchVo vo = new DriverDispatchVo();
- vo.setDriverId(deviceId);
- vo.setInStatusList(Arrays.asList(3,5));
-// vo.setInTdoStatusList(Arrays.asList(1, 2));
- List<DriverDispatchVo> driverDispatchVos = tmsDispatchOrderMapper.selectAssignedItineraryList(vo);
- if (driverDispatchVos != null && !driverDispatchVos.isEmpty()){
- driverDispatchVos.forEach(item ->{
- item.setStatusStr("瀹屾垚琛岀▼");
- });
- }
-
-
- return AjaxResult.success(driverDispatchVos);
- }
- @Override
- public AjaxResult selectAssignedItineraryDetail(Integer dispatchId) {
- Integer deviceId = userService.getDeviceId(SecurityUtils.getUserId());
- if (deviceId == null){
- return AjaxResult.success();
- }
-
- DriverDispatchVo vo = new DriverDispatchVo();
- vo.setDriverId(deviceId);
- vo.setDispatchId(dispatchId);
- DriverDispatchVo driverDispatchVo = tmsDispatchOrderMapper.selectAssignedItineraryDetail(vo);
- if (driverDispatchVo != null){
- if (driverDispatchVo.getTddStatus() == 1 ){
- driverDispatchVo.setStatusStr("寰呯敥鎸�");
- }else if (driverDispatchVo.getTddStatus() == 2){
- driverDispatchVo.setStatusStr("寰呮帴鎸�");
- }else if (driverDispatchVo.getStatus() == 1){
- driverDispatchVo.setStatusStr("寰呭彂杞�");
- }else if (driverDispatchVo.getStatus() == 2){
- driverDispatchVo.setStatusStr("鍦ㄩ��");
- }else{
- driverDispatchVo.setStatusStr("瀹屾垚琛岀▼");
- }
- }
- return AjaxResult.success(driverDispatchVo);
- }
-
-
-
-
- /**
- * 鏌ヨ璋冨害鍗曠鐞� 璁板綍鏁�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 璋冨害鍗曠鐞嗛泦鍚�
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public int selectTmsDispatchOrderCount(TmsDispatchOrder tmsDispatchOrder)
- {
- return tmsDispatchOrderMapper.selectTmsDispatchOrderCount(tmsDispatchOrder);
- }
-
- /**
- * 鏌ヨ璋冨害鍗曠鐞嗗垪琛�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 璋冨害鍗曠鐞�
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public List<TmsDispatchOrder> selectTmsDispatchOrderList(TmsDispatchOrder tmsDispatchOrder)
- {
- return tmsDispatchOrderMapper.selectTmsDispatchOrderList(tmsDispatchOrder);
- }
-
- /**
- * 鏌ヨ璋冨害鍗曠鐞嗗垪琛� 寮傛 瀵煎嚭
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
- * @return 璋冨害鍗曠鐞嗛泦鍚�
- */
- @DataSource(DataSourceType.SLAVE)
- @Async
- @Override
- public void export(TmsDispatchOrder tmsDispatchOrder,String exportKey) {
-
- super.export(TmsDispatchOrder.class,exportKey,"tmsDispatchOrderData",(pageNum)->{
- PageUtils.startPage(pageNum, Constants.EXPORT_PATE_SIZE);
- return selectTmsDispatchOrderList(tmsDispatchOrder);
- });
- }
-
-
- /**
- * 鏂板璋冨害鍗曠鐞�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- @Override
- public int insertTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder)
- {
- String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.DL);
-
- tmsDispatchOrder.setDispatchNo(noByKey);
- tmsDispatchOrder.setCreateBy(SecurityUtils.getUsername());
- tmsDispatchOrder.setCreateTime(DateUtils.getNowDate());
- return tmsDispatchOrderMapper.insertTmsDispatchOrder(tmsDispatchOrder);
- }
-
- /**
- * 鏂板璋冨害鍗曠鐞哰鎵归噺]
- *
- * @param tmsDispatchOrders 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- @Override
- public int insertTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders)
- {
- int rows = tmsDispatchOrderMapper.insertTmsDispatchOrderBatch(tmsDispatchOrders);
- return rows;
- }
-
- /**
- * 淇敼璋冨害鍗曠鐞�
- *
- * @param tmsDispatchOrder 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- @Override
- public int updateTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder)
- {
- tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
-
- tmsDispatchOrder.setUpdateTime(DateUtils.getNowDate());
- return tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
- }
-
- /**
- * 淇敼璋冨害鍗曠鐞哰鎵归噺]
- *
- * @param tmsDispatchOrders 璋冨害鍗曠鐞�
- * @return 缁撴灉
- */
- @Override
- public int updateTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders){
- return tmsDispatchOrderMapper.updateTmsDispatchOrderBatch(tmsDispatchOrders);
- }
-
- /**
- * 鍒犻櫎璋冨害鍗曠鐞嗗璞�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsDispatchOrderByIds(String ids)
- {
- return deleteTmsDispatchOrderByIds(Convert.toIntArray(ids));
- }
-
- /**
- * 鍒犻櫎璋冨害鍗曠鐞嗗璞�
- *
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsDispatchOrderByIds(Integer[] ids)
- {
- return tmsDispatchOrderMapper.deleteTmsDispatchOrderByIds(ids);
- }
-
- /**
- * 鍒犻櫎璋冨害鍗曠鐞嗕俊鎭�
- *
- * @param id 璋冨害鍗曠鐞咺D
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsDispatchOrderById(Integer id)
- {
- return tmsDispatchOrderMapper.deleteTmsDispatchOrderById(id);
- }
-
- @Override
- public List<TmsDispatchOrder> initGenerate(List<Integer> ids) {
- List<TmsDispatchOrder> tmsDispatchOrders = tmsDispatchOrderMapper.selectBatchIds(ids);
- if (tmsDispatchOrders != null && !tmsDispatchOrders.isEmpty()){
- tmsDispatchOrders.forEach(tmsDispatchOrder -> {
- // 瀹㈡埛ID
- Integer customerId = tmsDispatchOrder.getCustomerId();
-
- // 杞﹀瀷
- String actualVehicleType = tmsDispatchOrder.getActualVehicleType();
-
- // 杩愯緭璺嚎 = 鍙戣揣鍦拌鏀垮尯鍩� + 鏀惰揣鍦拌鏀垮尯鍩�
- String shipperRegionCode = tmsDispatchOrder.getShipperRegionCode();
- String receiverRegionCode = tmsDispatchOrder.getReceiverRegionCode();
- if (tmsDispatchOrder.getAccountsReceivableStatus() != null && tmsDispatchOrder.getAccountsReceivableStatus() == 1){
- TmsQuotePlan tmsQuotePlan = tmsQuotePlanMapper.selectTmsQuotePlanById(tmsDispatchOrder.getCollectionPlanId());
- tmsDispatchOrder.setCollectionPlanId(tmsQuotePlan.getId());
- tmsDispatchOrder.setCollectionPlanName(tmsQuotePlan.getPlanName());
- }else{
- // 鏌ヨ搴旀敹瑙勫垯
- TmsQuoteDetail tmsQuoteDetail = tmsQuoteDetailMapper.selectOne(new LambdaQueryWrapper<TmsQuoteDetail>()
- .eq(TmsQuoteDetail::getCustomerId, customerId)
- .eq(TmsQuoteDetail::getVehicleType, actualVehicleType)
- .eq(TmsQuoteDetail::getStartRegionCode, shipperRegionCode)
- .eq(TmsQuoteDetail::getEndRegionCode, receiverRegionCode)
- .eq(TmsQuoteDetail::getPlanType, 0)
- .last("limit 1")
- );
- if (tmsQuoteDetail != null){
- TmsQuotePlan tmsQuotePlan = tmsQuotePlanMapper.selectTmsQuotePlanById(tmsQuoteDetail.getQuotePlanId());
- tmsDispatchOrder.setCollectionPlanId(tmsQuotePlan.getId());
- tmsDispatchOrder.setCollectionPlanName(tmsQuotePlan.getPlanName());
- tmsDispatchOrder.setCollectionPlanDetailId(tmsQuoteDetail.getId());
- tmsDispatchOrder.setCollectionPlanAmount(tmsQuoteDetail.getFreightPrice());
- }else{
- tmsDispatchOrder.setAccountsReceivableStatus(2);
- }
- }
-
- if (tmsDispatchOrder.getAccountsPayableStatus() != null && tmsDispatchOrder.getAccountsPayableStatus() == 1){
- TmsQuotePlan tmsQuotePlan = tmsQuotePlanMapper.selectTmsQuotePlanById(tmsDispatchOrder.getPaymentPlanId());
- tmsDispatchOrder.setPaymentPlanId(tmsQuotePlan.getId());
- tmsDispatchOrder.setPaymentPlanName(tmsQuotePlan.getPlanName());
- }else{
- // 鏌ヨ搴斾粯瑙勫垯
- TmsQuoteDetail tmsQuoteDetail2 = tmsQuoteDetailMapper.selectOne(new LambdaQueryWrapper<TmsQuoteDetail>()
- .eq(TmsQuoteDetail::getCustomerId, customerId)
- .eq(TmsQuoteDetail::getVehicleType, actualVehicleType)
- .eq(TmsQuoteDetail::getStartRegionCode, shipperRegionCode)
- .eq(TmsQuoteDetail::getEndRegionCode, receiverRegionCode)
- .eq(TmsQuoteDetail::getPlanType, 1)
- .last("limit 1")
- );
-
- if (tmsQuoteDetail2 != null){
- TmsQuotePlan tmsQuotePlan = tmsQuotePlanMapper.selectTmsQuotePlanById(tmsQuoteDetail2.getQuotePlanId());
- tmsDispatchOrder.setPaymentPlanId(tmsQuotePlan.getId());
- tmsDispatchOrder.setPaymentPlanName(tmsQuotePlan.getPlanName());
- tmsDispatchOrder.setPaymentPlanDetailId(tmsQuoteDetail2.getId());
- tmsDispatchOrder.setPaymentPlanAmount(tmsQuoteDetail2.getFreightPrice());
-
- }else{
- tmsDispatchOrder.setAccountsPayableStatus(2);
- }
- }
-
-
- });
- }
- return tmsDispatchOrders;
- }
-
- @Override
- public AjaxResult generateTmsDispatchOrder(List<Integer> ids) {
- List<TmsDispatchOrder> tmsDispatchOrders = initGenerate(ids);
- List<TmsDispatchOrder> collect1 = tmsDispatchOrders.stream().filter(item -> item.getIsCustoms() == 0 && item.getCustomsServiceProviderId() == null).collect(Collectors.toList());
- if (!collect1.isEmpty()){
- String disNos = collect1.stream().map(TmsDispatchOrder::getDispatchNo).collect(Collectors.joining(","));
- return AjaxResult.error("璋冨害鍗�"+disNos+"鏈ˉ鍏呭鎵樻姤鍏充俊鎭�");
- }
- List<TmsDispatchOrder> collect2 = tmsDispatchOrders.stream().filter(item -> item.getIsLoad() == 0 && item.getLoadingServiceProviderId() == null).collect(Collectors.toList());
- if (!collect2.isEmpty()){
- String disNos = collect2.stream().map(TmsDispatchOrder::getDispatchNo).collect(Collectors.joining(","));
- return AjaxResult.error("璋冨害鍗�"+disNos+"鏈ˉ鍏呰鍗歌揣淇℃伅");
- }
- List<TmsDispatchOrder> receivableList = tmsDispatchOrders.stream().filter(item -> item.getAccountsReceivableStatus() == 0).collect(Collectors.toList());
- if (!receivableList.isEmpty()){
- List<TmsDispatchOrder> collect = receivableList.stream().map(item -> {
- TmsDispatchOrder tmsDispatchOrder = new TmsDispatchOrder();
- tmsDispatchOrder.setId(item.getId());
- tmsDispatchOrder.setAccountsReceivableStatus(1);
- tmsDispatchOrder.setCollectionPlanId(item.getCollectionPlanId());
- tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
- return tmsDispatchOrder;
- }).collect(Collectors.toList());
- // 1銆佷慨鏀硅皟搴�
- tmsDispatchOrderMapper.updateTmsDispatchOrderBatch(collect);
- // 2銆佺敓鎴愬簲鏀惰处鍗�
- List<TmsFinance> tmsFinances = BeanUtil.copyToList(receivableList, TmsFinance.class);
- tmsFinances.forEach(item ->{
- item.setSystemCode(systemDataNoService.getNoByKey(SystemDataNoEnum.YSD));
- item.setPlanName(item.getCollectionPlanName());
- item.setDispatchId(item.getId());
- item.setCreateBy(SecurityUtils.getUsername());
- item.setCreateTime(new Date());
- item.setUpdateBy(SecurityUtils.getUsername());
- item.setUpdateTime(new Date());
- item.setStatus(0);
- item.setType(0);
- item.setTotalAmount(item.getCollectionPlanAmount());
- });
- tmsFinanceService.insertTmsFinanceYFBatch(tmsFinances);
- }
-
- List<TmsDispatchOrder> playList = tmsDispatchOrders.stream().filter(item -> item.getAccountsPayableStatus() == 0).collect(Collectors.toList());
- if (!playList.isEmpty()){
- List<TmsDispatchOrder> collect = playList.stream().map(item -> {
- TmsDispatchOrder tmsDispatchOrder = new TmsDispatchOrder();
- tmsDispatchOrder.setId(item.getId());
- tmsDispatchOrder.setAccountsPayableStatus(1);
- tmsDispatchOrder.setPaymentPlanId(item.getPaymentPlanId());
- tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
- return tmsDispatchOrder;
- }).collect(Collectors.toList());
- // 1銆佷慨鏀硅皟搴�
- tmsDispatchOrderMapper.updateTmsDispatchOrderBatch(collect);
- // 2銆佺敓鎴愬簲浠樿处鍗�
- List<TmsFinance> tmsFinances = BeanUtil.copyToList(receivableList, TmsFinance.class);
- tmsFinances.forEach(item ->{
- item.setSystemCode(systemDataNoService.getNoByKey(SystemDataNoEnum.YFD));
- item.setPlanName(item.getPaymentPlanName());
- item.setDispatchId(item.getId());
- item.setCreateBy(SecurityUtils.getUsername());
- item.setCreateTime(new Date());
- item.setUpdateBy(SecurityUtils.getUsername());
- item.setUpdateTime(new Date());
- item.setStatus(0);
- item.setType(1);
- item.setTotalAmount(item.getPaymentPlanAmount());
- });
- tmsFinanceService.insertTmsFinanceYFBatch(tmsFinances);
-
- }
-
- return AjaxResult.success();
- }
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
index ce3bc60..bf15895 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
@@ -1,12 +1,10 @@
package com.ruoyi.tms.service.impl;
import java.math.BigDecimal;
-import java.util.Collections;
import java.util.List;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.SystemDataNoEnum;
import com.ruoyi.common.utils.DateUtils;
@@ -16,10 +14,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.ISystemDataNoService;
-import com.ruoyi.tms.domain.TmsDispatchOrder;
import com.ruoyi.tms.domain.TmsFinance;
import com.ruoyi.tms.domain.vo.FinanceDetailItem;
-import com.ruoyi.tms.mapper.TmsDispatchOrderMapper;
import com.ruoyi.tms.mapper.TmsFinanceMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -55,8 +51,7 @@
@Resource
private TmsFinanceMapper tmsFinanceMapper;
- @Resource
- private TmsDispatchOrderMapper tmsDispatchOrderMapper;
+
@Autowired
ISystemDataNoService systemDataNoService;
@Autowired
@@ -113,17 +108,7 @@
if (dispatchId !=null){
eq.eq(TmsFinanceDetail::getDispatchOrderId, dispatchId);
}
- List<TmsFinanceDetail> tmsFinanceDetails = tmsFinanceDetailMapper.selectList(eq);
- if (tmsFinanceDetails != null && !tmsFinanceDetails.isEmpty()){
- tmsFinanceDetails.forEach(tmsFinanceDetail -> {
- TmsDispatchOrder tmsDispatchOrder = tmsDispatchOrderMapper.selectById(tmsFinanceDetail.getDispatchOrderId());
- if (tmsDispatchOrder != null){
- tmsFinanceDetail.setDispatchNo(tmsDispatchOrder.getDispatchNo());
- tmsFinanceDetail.setCustomerName(tmsDispatchOrder.getCustomerName());
- }
- });
- }
- return tmsFinanceDetails;
+ return tmsFinanceDetailMapper.selectList(eq);
}
/**
@@ -184,11 +169,8 @@
public void addItem (TmsFinance tmsFinance, TmsFinanceDetail tmsFinanceDetail){
if (tmsFinance == null){
- TmsDispatchOrder tmsDispatchOrder = tmsDispatchOrderMapper.selectTmsDispatchOrderById(tmsFinanceDetail.getDispatchOrderId());
- if (tmsDispatchOrder == null){
- throw new RuntimeException("鏈壘鍒板搴旂殑璋冨害鍗�");
- }
- tmsFinance = BeanUtil.copyProperties(tmsDispatchOrder,TmsFinance.class);
+
+ tmsFinance = new TmsFinance();
SystemDataNoEnum systemDataNoEnum = tmsFinanceDetail.getFinanceType() == 0 ? SystemDataNoEnum.YFD :
tmsFinanceDetail.getFinanceType() == 1 ? SystemDataNoEnum.YSD : SystemDataNoEnum.OF;
tmsFinance.setSystemCode(systemDataNoService.getNoByKey(systemDataNoEnum));
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceServiceImpl.java
index 1541a12..81ead70 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceServiceImpl.java
@@ -8,10 +8,8 @@
import javax.annotation.Resource;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.tms.domain.TmsDispatchOrder;
import com.ruoyi.tms.domain.TmsFinanceDetail;
import com.ruoyi.tms.domain.TmsQuoteDetail;
-import com.ruoyi.tms.mapper.TmsDispatchOrderMapper;
import com.ruoyi.tms.mapper.TmsFinanceDetailMapper;
import com.ruoyi.tms.mapper.TmsQuoteDetailMapper;
import org.springframework.transaction.annotation.Transactional;
@@ -49,8 +47,6 @@
@Resource
private TmsQuoteDetailMapper tmsQuoteDetailMapper;
- @Resource
- private TmsDispatchOrderMapper tmsDispatchOrderMapper;
/**
* 鏌ヨ璐圭敤涓昏〃
@@ -236,20 +232,10 @@
// 1銆佷綔搴燂紝澶�
TmsFinance tmsFinance = selectTmsFinanceById(id);
tmsFinance.setStatus(2);
- updateTmsFinance(tmsFinance);
- // 3銆佸皢鍘熸潵鐨勮皟搴﹀崟鍙樺洖涓烘湭缁撶畻
- LambdaUpdateWrapper<TmsDispatchOrder> eq = new LambdaUpdateWrapper<TmsDispatchOrder>()
- .eq(TmsDispatchOrder::getId, tmsFinance.getDispatchId());
- if (tmsFinance.getType() == 0){
- eq.set(TmsDispatchOrder::getAccountsReceivableStatus, 0)
- .set(TmsDispatchOrder::getCollectionPlanId, null);
- }else if (tmsFinance.getType() == 1){
- eq.set(TmsDispatchOrder::getAccountsPayableStatus, 0)
- .set(TmsDispatchOrder::getPaymentPlanId, null)
- ;
- }
+ return updateTmsFinance(tmsFinance);
- return tmsDispatchOrderMapper.update(eq);
+
+
}
@Override
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsShelfServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsShelfServiceImpl.java
deleted file mode 100644
index 5138156..0000000
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsShelfServiceImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.ruoyi.tms.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.common.enums.SystemDataNoEnum;
-import com.ruoyi.common.utils.DateUtils;
-import javax.annotation.Resource;
-
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.service.ISystemDataNoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.stereotype.Service;
-import org.springframework.scheduling.annotation.Async;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.common.core.service.BaseService;
-
-import com.ruoyi.tms.mapper.TmsShelfMapper;
-import com.ruoyi.tms.domain.TmsShelf;
-import com.ruoyi.tms.service.ITmsShelfService;
-import com.ruoyi.common.core.text.Convert;
-
-/**
- * 鎵樻灦绠＄悊Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class TmsShelfServiceImpl extends BaseService<TmsShelfMapper, TmsShelf> implements ITmsShelfService
-{
- protected final Logger logger = LoggerFactory.getLogger(getClass());
- @Resource
- private TmsShelfMapper tmsShelfMapper;
- @Autowired
- ISystemDataNoService systemDataNoService;
-
- /**
- * 鏌ヨ鎵樻灦绠＄悊
- *
- * @param id 鎵樻灦绠＄悊ID
- * @return 鎵樻灦绠＄悊
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public TmsShelf selectTmsShelfById(Integer id)
- {
- return tmsShelfMapper.selectTmsShelfById(id);
- }
-
- /**
- * 鏌ヨ鎵樻灦绠＄悊 璁板綍鏁�
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 鎵樻灦绠＄悊闆嗗悎
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public int selectTmsShelfCount(TmsShelf tmsShelf)
- {
- return tmsShelfMapper.selectTmsShelfCount(tmsShelf);
- }
-
- /**
- * 鏌ヨ鎵樻灦绠＄悊鍒楄〃
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 鎵樻灦绠＄悊
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public List<TmsShelf> selectTmsShelfList(TmsShelf tmsShelf)
- {
- return tmsShelfMapper.selectTmsShelfList(tmsShelf);
- }
-
- /**
- * 鏌ヨ鎵樻灦绠＄悊鍒楄〃 寮傛 瀵煎嚭
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
- * @return 鎵樻灦绠＄悊闆嗗悎
- */
- @DataSource(DataSourceType.SLAVE)
- @Async
- @Override
- public void export(TmsShelf tmsShelf,String exportKey) {
-
- super.export(TmsShelf.class,exportKey,"tmsShelfData",(pageNum)->{
- PageUtils.startPage(pageNum, Constants.EXPORT_PATE_SIZE);
- return selectTmsShelfList(tmsShelf);
- });
- }
-
-
- /**
- * 鏂板鎵樻灦绠＄悊
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int insertTmsShelf(TmsShelf tmsShelf)
- {
- tmsShelf.setSystemCode(systemDataNoService.getNoByKey(SystemDataNoEnum.TJ));
- tmsShelf.setCreateBy(SecurityUtils.getUsername());
- tmsShelf.setCreateTime(DateUtils.getNowDate());
- return tmsShelfMapper.insertTmsShelf(tmsShelf);
- }
-
- /**
- * 鏂板鎵樻灦绠＄悊[鎵归噺]
- *
- * @param tmsShelfs 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int insertTmsShelfBatch(List<TmsShelf> tmsShelfs)
- {
- int rows = tmsShelfMapper.insertTmsShelfBatch(tmsShelfs);
- return rows;
- }
-
- /**
- * 淇敼鎵樻灦绠＄悊
- *
- * @param tmsShelf 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int updateTmsShelf(TmsShelf tmsShelf)
- {
- tmsShelf.setUpdateBy(SecurityUtils.getUsername());
- tmsShelf.setUpdateTime(DateUtils.getNowDate());
- return tmsShelfMapper.updateTmsShelf(tmsShelf);
- }
-
- /**
- * 淇敼鎵樻灦绠＄悊[鎵归噺]
- *
- * @param tmsShelfs 鎵樻灦绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int updateTmsShelfBatch(List<TmsShelf> tmsShelfs){
- return tmsShelfMapper.updateTmsShelfBatch(tmsShelfs);
- }
-
- /**
- * 鍒犻櫎鎵樻灦绠＄悊瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsShelfByIds(String ids)
- {
- return deleteTmsShelfByIds(Convert.toIntArray(ids));
- }
-
- /**
- * 鍒犻櫎鎵樻灦绠＄悊瀵硅薄
- *
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsShelfByIds(Integer[] ids)
- {
- return tmsShelfMapper.deleteTmsShelfByIds(ids);
- }
-
- /**
- * 鍒犻櫎鎵樻灦绠＄悊淇℃伅
- *
- * @param id 鎵樻灦绠＄悊ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsShelfById(Integer id)
- {
- return tmsShelfMapper.deleteTmsShelfById(id);
- }
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsVehicleDocumentServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsVehicleDocumentServiceImpl.java
deleted file mode 100644
index cf06ae3..0000000
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsVehicleDocumentServiceImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.ruoyi.tms.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.common.enums.SystemDataNoEnum;
-import com.ruoyi.common.utils.DateUtils;
-import javax.annotation.Resource;
-
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.service.ISystemDataNoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.stereotype.Service;
-import org.springframework.scheduling.annotation.Async;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.common.core.service.BaseService;
-
-import com.ruoyi.tms.mapper.TmsVehicleDocumentMapper;
-import com.ruoyi.tms.domain.TmsVehicleDocument;
-import com.ruoyi.tms.service.ITmsVehicleDocumentService;
-import com.ruoyi.common.core.text.Convert;
-
-/**
- * 杞﹁締璇佷欢Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2025-11-04
- */
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class TmsVehicleDocumentServiceImpl extends BaseService<TmsVehicleDocumentMapper, TmsVehicleDocument> implements ITmsVehicleDocumentService
-{
- protected final Logger logger = LoggerFactory.getLogger(getClass());
- @Resource
- private TmsVehicleDocumentMapper tmsVehicleDocumentMapper;
- @Autowired
- ISystemDataNoService systemDataNoService;
-
- /**
- * 鏌ヨ杞﹁締璇佷欢
- *
- * @param systemId 杞﹁締璇佷欢ID
- * @return 杞﹁締璇佷欢
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public TmsVehicleDocument selectTmsVehicleDocumentById(Integer id)
- {
- return tmsVehicleDocumentMapper.selectTmsVehicleDocumentById(id);
- }
-
- /**
- * 鏌ヨ杞﹁締璇佷欢 璁板綍鏁�
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 杞﹁締璇佷欢闆嗗悎
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public int selectTmsVehicleDocumentCount(TmsVehicleDocument tmsVehicleDocument)
- {
- return tmsVehicleDocumentMapper.selectTmsVehicleDocumentCount(tmsVehicleDocument);
- }
-
- /**
- * 鏌ヨ杞﹁締璇佷欢鍒楄〃
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 杞﹁締璇佷欢
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public List<TmsVehicleDocument> selectTmsVehicleDocumentList(TmsVehicleDocument tmsVehicleDocument)
- {
- return tmsVehicleDocumentMapper.selectTmsVehicleDocumentList(tmsVehicleDocument);
- }
-
- /**
- * 鏌ヨ杞﹁締璇佷欢鍒楄〃 寮傛 瀵煎嚭
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
- * @return 杞﹁締璇佷欢闆嗗悎
- */
- @DataSource(DataSourceType.SLAVE)
- @Async
- @Override
- public void export(TmsVehicleDocument tmsVehicleDocument,String exportKey) {
-
- super.export(TmsVehicleDocument.class,exportKey,"tmsVehicleDocumentData",(pageNum)->{
- PageUtils.startPage(pageNum, Constants.EXPORT_PATE_SIZE);
- return selectTmsVehicleDocumentList(tmsVehicleDocument);
- });
- }
-
-
- /**
- * 鏂板杞﹁締璇佷欢
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- @Override
- public int insertTmsVehicleDocument(TmsVehicleDocument tmsVehicleDocument)
- {
- String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.ZJ);
- tmsVehicleDocument.setSystemCode(noByKey);
- tmsVehicleDocument.setCreateBy(SecurityUtils.getUsername());
-
- tmsVehicleDocument.setCreateTime(DateUtils.getNowDate());
- return tmsVehicleDocumentMapper.insertTmsVehicleDocument(tmsVehicleDocument);
- }
-
- /**
- * 鏂板杞﹁締璇佷欢[鎵归噺]
- *
- * @param tmsVehicleDocuments 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- @Override
- public int insertTmsVehicleDocumentBatch(List<TmsVehicleDocument> tmsVehicleDocuments)
- {
- int rows = tmsVehicleDocumentMapper.insertTmsVehicleDocumentBatch(tmsVehicleDocuments);
- return rows;
- }
-
- /**
- * 淇敼杞﹁締璇佷欢
- *
- * @param tmsVehicleDocument 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- @Override
- public int updateTmsVehicleDocument(TmsVehicleDocument tmsVehicleDocument)
- {
- tmsVehicleDocument.setUpdateBy(SecurityUtils.getUsername());
- tmsVehicleDocument.setUpdateTime(DateUtils.getNowDate());
- return tmsVehicleDocumentMapper.updateTmsVehicleDocument(tmsVehicleDocument);
- }
-
- /**
- * 淇敼杞﹁締璇佷欢[鎵归噺]
- *
- * @param tmsVehicleDocuments 杞﹁締璇佷欢
- * @return 缁撴灉
- */
- @Override
- public int updateTmsVehicleDocumentBatch(List<TmsVehicleDocument> tmsVehicleDocuments){
- return tmsVehicleDocumentMapper.updateTmsVehicleDocumentBatch(tmsVehicleDocuments);
- }
-
- /**
- * 鍒犻櫎杞﹁締璇佷欢瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsVehicleDocumentByIds(String ids)
- {
- return deleteTmsVehicleDocumentByIds(Convert.toIntArray(ids));
- }
-
- /**
- * 鍒犻櫎杞﹁締璇佷欢瀵硅薄
- *
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsVehicleDocumentByIds(Integer[] ids)
- {
- return tmsVehicleDocumentMapper.deleteTmsVehicleDocumentByIds(ids);
- }
-
- /**
- * 鍒犻櫎杞﹁締璇佷欢淇℃伅
- *
- * @param id 杞﹁締璇佷欢ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsVehicleDocumentById(Integer id)
- {
- return tmsVehicleDocumentMapper.deleteTmsVehicleDocumentById(id);
- }
-}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsVehicleServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsVehicleServiceImpl.java
deleted file mode 100644
index 3cc18f4..0000000
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsVehicleServiceImpl.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.ruoyi.tms.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.common.enums.SystemDataNoEnum;
-import com.ruoyi.common.utils.DateUtils;
-import javax.annotation.Resource;
-
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.service.ISystemDataNoService;
-import com.ruoyi.tms.domain.TmsServiceProvider;
-import com.ruoyi.tms.mapper.TmsServiceProviderMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.stereotype.Service;
-import org.springframework.scheduling.annotation.Async;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.common.core.service.BaseService;
-
-import com.ruoyi.tms.mapper.TmsVehicleMapper;
-import com.ruoyi.tms.domain.TmsVehicle;
-import com.ruoyi.tms.service.ITmsVehicleService;
-import com.ruoyi.common.core.text.Convert;
-
-/**
- * 杞﹁締绠＄悊Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2025-11-03
- */
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class TmsVehicleServiceImpl extends BaseService<TmsVehicleMapper, TmsVehicle> implements ITmsVehicleService
-{
- protected final Logger logger = LoggerFactory.getLogger(getClass());
- @Resource
- private TmsVehicleMapper tmsVehicleMapper;
- @Resource
- private TmsServiceProviderMapper tmsServiceProviderMapper;
- @Autowired
- ISystemDataNoService systemDataNoService;
- /**
- * 鏌ヨ杞﹁締绠＄悊
- *
- * @param id 杞﹁締绠＄悊ID
- * @return 杞﹁締绠＄悊
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public TmsVehicle selectTmsVehicleById(Integer id)
- {
- return tmsVehicleMapper.selectTmsVehicleById(id);
- }
-
- /**
- * 鏌ヨ杞﹁締绠＄悊 璁板綍鏁�
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 杞﹁締绠＄悊闆嗗悎
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public int selectTmsVehicleCount(TmsVehicle tmsVehicle)
- {
- return tmsVehicleMapper.selectTmsVehicleCount(tmsVehicle);
- }
-
- /**
- * 鏌ヨ杞﹁締绠＄悊鍒楄〃
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 杞﹁締绠＄悊
- */
- @DataSource(DataSourceType.SLAVE)
- @Override
- public List<TmsVehicle> selectTmsVehicleList(TmsVehicle tmsVehicle)
- {
- return tmsVehicleMapper.selectTmsVehicleList(tmsVehicle);
- }
-
- /**
- * 鏌ヨ杞﹁締绠＄悊鍒楄〃 寮傛 瀵煎嚭
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
- * @return 杞﹁締绠＄悊闆嗗悎
- */
- @DataSource(DataSourceType.SLAVE)
- @Async
- @Override
- public void export(TmsVehicle tmsVehicle,String exportKey) {
-
- super.export(TmsVehicle.class,exportKey,"tmsVehicleData",(pageNum)->{
- PageUtils.startPage(pageNum, Constants.EXPORT_PATE_SIZE);
- return selectTmsVehicleList(tmsVehicle);
- });
- }
-
-
- /**
- * 鏂板杞﹁締绠＄悊
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int insertTmsVehicle(TmsVehicle tmsVehicle)
- {
- String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.CN);
- tmsVehicle.setSystemCode(noByKey);
- tmsVehicle.setCreateBy(SecurityUtils.getUsername());
- tmsVehicle.setCreateTime(DateUtils.getNowDate());
- return tmsVehicleMapper.insertTmsVehicle(tmsVehicle);
- }
-
- /**
- * 鏂板杞﹁締绠＄悊[鎵归噺]
- *
- * @param tmsVehicles 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int insertTmsVehicleBatch(List<TmsVehicle> tmsVehicles)
- {
- int rows = tmsVehicleMapper.insertTmsVehicleBatch(tmsVehicles);
- return rows;
- }
-
- /**
- * 淇敼杞﹁締绠＄悊
- *
- * @param tmsVehicle 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int updateTmsVehicle(TmsVehicle tmsVehicle)
- {
- tmsVehicle.setUpdateBy(SecurityUtils.getUsername());
- tmsVehicle.setUpdateTime(DateUtils.getNowDate());
- return tmsVehicleMapper.updateTmsVehicle(tmsVehicle);
- }
-
- /**
- * 淇敼杞﹁締绠＄悊[鎵归噺]
- *
- * @param tmsVehicles 杞﹁締绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int updateTmsVehicleBatch(List<TmsVehicle> tmsVehicles){
- return tmsVehicleMapper.updateTmsVehicleBatch(tmsVehicles);
- }
-
- /**
- * 鍒犻櫎杞﹁締绠＄悊瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsVehicleByIds(String ids)
- {
- return deleteTmsVehicleByIds(Convert.toIntArray(ids));
- }
-
- /**
- * 鍒犻櫎杞﹁締绠＄悊瀵硅薄
- *
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsVehicleByIds(Integer[] ids)
- {
- return tmsVehicleMapper.deleteTmsVehicleByIds(ids);
- }
-
- /**
- * 鍒犻櫎杞﹁締绠＄悊淇℃伅
- *
- * @param id 杞﹁締绠＄悊ID
- * @return 缁撴灉
- */
- @Override
- public int deleteTmsVehicleById(Integer id)
- {
- return tmsVehicleMapper.deleteTmsVehicleById(id);
- }
-}
diff --git a/tms/src/main/resources/mapper/tms/TmsContainerMapper.xml b/tms/src/main/resources/mapper/tms/TmsContainerMapper.xml
deleted file mode 100644
index 259e140..0000000
--- a/tms/src/main/resources/mapper/tms/TmsContainerMapper.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.tms.mapper.TmsContainerMapper">
-
- <resultMap type="com.ruoyi.tms.domain.TmsContainer" id="TmsContainerResult">
- <result property="id" column="id" />
- <result property="systemCode" column="system_code" />
- <result property="containerCode" column="container_code" />
- <result property="containerUseType" column="container_use_type" />
- <result property="containerSize" column="container_size" />
- <result property="ownerTeamId" column="owner_team_id" />
- <result property="ownerTeamName" column="owner_team_name" />
- <result property="manufacturer" column="manufacturer" />
- <result property="manufactureDate" column="manufacture_date" />
- <result property="lengthMm" column="length_mm" />
- <result property="widthMm" column="width_mm" />
- <result property="heightMm" column="height_mm" />
- <result property="maxTotalWeightKg" column="max_total_weight_kg" />
- <result property="maxLoadKg" column="max_load_kg" />
- <result property="volumeM3" column="volume_m3" />
- <result property="isInUse" column="is_in_use" />
- <result property="maintenanceStatus" column="maintenance_status" />
- <result property="lastMaintenanceDate" column="last_maintenance_date" />
- <result property="nextMaintenanceDate" column="next_maintenance_date" />
- <result property="status" column="status" />
- <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="selfLeasType" column="self_leas_type" />
-
- </resultMap>
-
- <sql id="selectTmsContainerVo">
- select thisTab.id, thisTab.system_code, thisTab.container_code, thisTab.container_use_type, thisTab.container_size, thisTab.owner_team_id, thisTab.owner_team_name, thisTab.manufacturer, thisTab.manufacture_date, thisTab.length_mm, thisTab.width_mm, thisTab.height_mm, thisTab.max_total_weight_kg, thisTab.max_load_kg, thisTab.volume_m3, thisTab.is_in_use, thisTab.maintenance_status, thisTab.last_maintenance_date, thisTab.next_maintenance_date, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark ,thisTab.self_leas_type from tms_container AS thisTab
- </sql>
- <sql id="selectTmsContainerVoCount">
- select count(0) from tms_container as thisTab
- </sql>
-
- <sql id="whereCondition">
- <if test="systemCode != null and systemCode != ''"> and thisTab.system_code = #{systemCode}</if>
- <if test="containerCode != null and containerCode != ''"> and thisTab.container_code = #{containerCode}</if>
- <if test="containerUseType != null "> and thisTab.container_use_type = #{containerUseType}</if>
- <if test="containerSize != null "> and thisTab.container_size = #{containerSize}</if>
- <if test="ownerTeamId != null "> and thisTab.owner_team_id = #{ownerTeamId}</if>
- <if test="ownerTeamName != null and ownerTeamName != ''"> and thisTab.owner_team_name like concat('%', #{ownerTeamName}, '%')</if>
- <if test="isInUse != null "> and thisTab.is_in_use = #{isInUse}</if>
- <if test="maintenanceStatus != null "> and thisTab.maintenance_status = #{maintenanceStatus}</if>
- <if test="status != null "> and thisTab.status = #{status}</if>
- <if test="selfLeasType != null "> and thisTab.self_leas_type = #{selfLeasType}</if>
-
- </sql>
-
- <!--鏌ヨ-->
- <select id="selectTmsContainerById" parameterType="Integer" resultMap="TmsContainerResult">
- <include refid="selectTmsContainerVo"/>
- where id = #{id}
- </select>
-
- <select id="selectTmsContainerCount" parameterType="com.ruoyi.tms.domain.TmsContainer" resultType="int">
- <include refid="selectTmsContainerVoCount"/>
- <where>
- <include refid="whereCondition"/>
- </where>
- </select>
-
- <select id="selectTmsContainerList" parameterType="com.ruoyi.tms.domain.TmsContainer" resultMap="TmsContainerResult">
- <include refid="selectTmsContainerVo"/>
- <where>
- <include refid="whereCondition"/>
- </where>
- order by thisTab.id desc
- </select>
-
- <!-- 鏂板 -->
- <insert id="insertTmsContainer" parameterType="com.ruoyi.tms.domain.TmsContainer" useGeneratedKeys="true" keyProperty="id">
- insert into tms_container
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="systemCode != null and systemCode != ''">system_code,</if>
- <if test="containerCode != null and containerCode != ''">container_code,</if>
- <if test="containerUseType != null">container_use_type,</if>
- <if test="containerSize != null">container_size,</if>
- <if test="ownerTeamId != null">owner_team_id,</if>
- <if test="ownerTeamName != null">owner_team_name,</if>
- <if test="manufacturer != null">manufacturer,</if>
- <if test="manufactureDate != null">manufacture_date,</if>
- <if test="lengthMm != null">length_mm,</if>
- <if test="widthMm != null">width_mm,</if>
- <if test="heightMm != null">height_mm,</if>
- <if test="maxTotalWeightKg != null">max_total_weight_kg,</if>
- <if test="maxLoadKg != null">max_load_kg,</if>
- <if test="volumeM3 != null">volume_m3,</if>
- <if test="isInUse != null">is_in_use,</if>
- <if test="maintenanceStatus != null">maintenance_status,</if>
- <if test="lastMaintenanceDate != null">last_maintenance_date,</if>
- <if test="nextMaintenanceDate != null">next_maintenance_date,</if>
- <if test="status != null">status,</if>
- <if test="createBy != null">create_by,</if>
- <if test="createTime != null">create_time,</if>
- <if test="updateBy != null">update_by,</if>
- <if test="updateTime != null">update_time,</if>
- <if test="remark != null">remark,</if>
- <if test="selfLeasType != null">self_leas_type,</if>
-
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="systemCode != null and systemCode != ''">#{systemCode},</if>
- <if test="containerCode != null and containerCode != ''">#{containerCode},</if>
- <if test="containerUseType != null">#{containerUseType},</if>
- <if test="containerSize != null">#{containerSize},</if>
- <if test="ownerTeamId != null">#{ownerTeamId},</if>
- <if test="ownerTeamName != null">#{ownerTeamName},</if>
- <if test="manufacturer != null">#{manufacturer},</if>
- <if test="manufactureDate != null">#{manufactureDate},</if>
- <if test="lengthMm != null">#{lengthMm},</if>
- <if test="widthMm != null">#{widthMm},</if>
- <if test="heightMm != null">#{heightMm},</if>
- <if test="maxTotalWeightKg != null">#{maxTotalWeightKg},</if>
- <if test="maxLoadKg != null">#{maxLoadKg},</if>
- <if test="volumeM3 != null">#{volumeM3},</if>
- <if test="isInUse != null">#{isInUse},</if>
- <if test="maintenanceStatus != null">#{maintenanceStatus},</if>
- <if test="lastMaintenanceDate != null">#{lastMaintenanceDate},</if>
- <if test="nextMaintenanceDate != null">#{nextMaintenanceDate},</if>
- <if test="status != null">#{status},</if>
- <if test="createBy != null">#{createBy},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="updateBy != null">#{updateBy},</if>
- <if test="updateTime != null">#{updateTime},</if>
- <if test="remark != null">#{remark},</if>
- <if test="selfLeasType != null">#{selfLeasType},</if>
-
- </trim>
- </insert>
-
- <insert id="insertTmsContainerBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
- insert into tms_container
- <trim prefix="(" suffix=") values" suffixOverrides=",">
- id,system_code,container_code,container_use_type,container_size,owner_team_id,owner_team_name,manufacturer,manufacture_date,length_mm,width_mm,height_mm,max_total_weight_kg,max_load_kg,volume_m3,is_in_use,maintenance_status,last_maintenance_date,next_maintenance_date,status,create_by,create_time,update_by,update_time,remark,self_leas_type,
- </trim>
- <foreach item="item" index="index" collection="list" separator=",">
- <trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.systemCode},#{item.containerCode},#{item.containerUseType},#{item.containerSize},#{item.ownerTeamId},#{item.ownerTeamName},#{item.manufacturer},#{item.manufactureDate},#{item.lengthMm},#{item.widthMm},#{item.heightMm},#{item.maxTotalWeightKg},#{item.maxLoadKg},#{item.volumeM3},#{item.isInUse},#{item.maintenanceStatus},#{item.lastMaintenanceDate},#{item.nextMaintenanceDate},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.item.selfLeasType},
- </trim>
- </foreach>
- </insert>
-
- <!-- 淇敼 -->
- <update id="updateTmsContainer" parameterType="com.ruoyi.tms.domain.TmsContainer">
- update tms_container
- <trim prefix="SET" suffixOverrides=",">
- <if test="systemCode != null and systemCode != ''">system_code = #{systemCode},</if>
- <if test="containerCode != null and containerCode != ''">container_code = #{containerCode},</if>
- <if test="containerUseType != null">container_use_type = #{containerUseType},</if>
- <if test="containerSize != null">container_size = #{containerSize},</if>
- <if test="ownerTeamId != null">owner_team_id = #{ownerTeamId},</if>
- <if test="ownerTeamName != null">owner_team_name = #{ownerTeamName},</if>
- <if test="manufacturer != null">manufacturer = #{manufacturer},</if>
- <if test="manufactureDate != null">manufacture_date = #{manufactureDate},</if>
- <if test="lengthMm != null">length_mm = #{lengthMm},</if>
- <if test="widthMm != null">width_mm = #{widthMm},</if>
- <if test="heightMm != null">height_mm = #{heightMm},</if>
- <if test="maxTotalWeightKg != null">max_total_weight_kg = #{maxTotalWeightKg},</if>
- <if test="maxLoadKg != null">max_load_kg = #{maxLoadKg},</if>
- <if test="volumeM3 != null">volume_m3 = #{volumeM3},</if>
- <if test="isInUse != null">is_in_use = #{isInUse},</if>
- <if test="maintenanceStatus != null">maintenance_status = #{maintenanceStatus},</if>
- <if test="lastMaintenanceDate != null">last_maintenance_date = #{lastMaintenanceDate},</if>
- <if test="nextMaintenanceDate != null">next_maintenance_date = #{nextMaintenanceDate},</if>
- <if test="status != null">status = #{status},</if>
- <if test="createBy != null">create_by = #{createBy},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
- <if test="updateBy != null">update_by = #{updateBy},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="selfLeasType != null">self_leas_type = #{selfLeasType},</if>
-
- </trim>
- where id = #{id}
- </update>
- <!-- 淇敼 -->
- <update id="updateTmsContainerBatch" parameterType="java.util.List">
- <foreach collection="list" item="item" index="index" separator=";">
- update tms_container
- <trim prefix="SET" suffixOverrides=",">
- <if test="item.systemCode != null and item.systemCode != ''">system_code = #{item.systemCode},</if>
- <if test="item.containerCode != null and item.containerCode != ''">container_code = #{item.containerCode},</if>
- <if test="item.containerUseType != null">container_use_type = #{item.containerUseType},</if>
- <if test="item.containerSize != null">container_size = #{item.containerSize},</if>
- <if test="item.ownerTeamId != null">owner_team_id = #{item.ownerTeamId},</if>
- <if test="item.ownerTeamName != null">owner_team_name = #{item.ownerTeamName},</if>
- <if test="item.manufacturer != null">manufacturer = #{item.manufacturer},</if>
- <if test="item.manufactureDate != null">manufacture_date = #{item.manufactureDate},</if>
- <if test="item.lengthMm != null">length_mm = #{item.lengthMm},</if>
- <if test="item.widthMm != null">width_mm = #{item.widthMm},</if>
- <if test="item.heightMm != null">height_mm = #{item.heightMm},</if>
- <if test="item.maxTotalWeightKg != null">max_total_weight_kg = #{item.maxTotalWeightKg},</if>
- <if test="item.maxLoadKg != null">max_load_kg = #{item.maxLoadKg},</if>
- <if test="item.volumeM3 != null">volume_m3 = #{item.volumeM3},</if>
- <if test="item.isInUse != null">is_in_use = #{item.isInUse},</if>
- <if test="item.maintenanceStatus != null">maintenance_status = #{item.maintenanceStatus},</if>
- <if test="item.lastMaintenanceDate != null">last_maintenance_date = #{item.lastMaintenanceDate},</if>
- <if test="item.nextMaintenanceDate != null">next_maintenance_date = #{item.nextMaintenanceDate},</if>
- <if test="item.status != null">status = #{item.status},</if>
- <if test="item.createBy != null">create_by = #{item.createBy},</if>
- <if test="item.createTime != null">create_time = #{item.createTime},</if>
- <if test="item.updateBy != null">update_by = #{item.updateBy},</if>
- <if test="item.updateTime != null">update_time = #{item.updateTime},</if>
- <if test="item.remark != null">remark = #{item.remark},</if>
- <if test="item.selfLeasType != null">self_leas_type = #{item.selfLeasType},</if>
- </trim>
- where id = #{item.id}
- </foreach>
- </update>
-
- <!--鍒犻櫎-->
- <delete id="deleteTmsContainerById" parameterType="Integer">
- delete from tms_container where id = #{id}
- </delete>
- <delete id="deleteTmsContainerByIds" parameterType="Integer">
- delete from tms_container where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml b/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
deleted file mode 100644
index a1b7b6b..0000000
--- a/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
+++ /dev/null
@@ -1,607 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.tms.mapper.TmsDispatchOrderMapper">
-
- <resultMap type="com.ruoyi.tms.domain.TmsDispatchOrder" id="TmsDispatchOrderResult">
- <result property="id" column="id" />
- <result property="dispatchNo" column="dispatch_no" />
- <result property="customerId" column="customer_id" />
- <result property="customerName" column="customer_name" />
- <result property="customerCode" column="customer_code" />
- <result property="projectId" column="project_id" />
- <result property="projectName" column="project_name" />
- <result property="contractId" column="contract_id" />
- <result property="contractName" column="contract_name" />
- <result property="orderType" column="order_type" />
- <result property="transportLine" column="transport_line" />
- <result property="signType" column="sign_type" />
- <result property="vehicleProviderId" column="vehicle_provider_id" />
- <result property="vehicleProviderName" column="vehicle_provider_name" />
- <result property="loadingServiceProviderId" column="loading_service_provider_id" />
- <result property="loadingServiceProviderName" column="loading_service_provider_name" />
- <result property="customsServiceProviderId" column="customs_service_provider_id" />
- <result property="customsServiceProviderName" column="customs_service_provider_name" />
- <result property="isUrgent" column="is_urgent" />
- <result property="transportType" column="transport_type" />
- <result property="loadMethod" column="load_method" />
- <result property="mainDriverId" column="main_driver_id" />
- <result property="mainDriverName" column="main_driver_name" />
- <result property="assistantDriverId" column="assistant_driver_id" />
- <result property="requiredVehicleTypes" column="required_vehicle_types" />
- <result property="assistantDriverName" column="assistant_driver_name" />
- <result property="vehicleId" column="vehicle_id" />
- <result property="containerNo" column="container_no" />
- <result property="licensePlate" column="license_plate" />
- <result property="shipperId" column="shipper_id" />
- <result property="earliestDeparture" column="earliest_departure" />
- <result property="shipperName" column="shipper_name" />
- <result property="latestDeparture" column="latest_departure" />
- <result property="shipperMobile" column="shipper_mobile" />
- <result property="earliestArrival" column="earliest_arrival" />
- <result property="shipperAddress" column="shipper_address" />
- <result property="latestArrival" column="latest_arrival" />
- <result property="departureAddress" column="departure_address" />
- <result property="shipperRegionCode" column="shipper_region_code" />
- <result property="receiverId" column="receiver_id" />
- <result property="destinationAddress" column="destination_address" />
- <result property="receiverName" column="receiver_name" />
- <result property="actualVehicleType" column="actual_vehicle_type" />
- <result property="receiverMobile" column="receiver_mobile" />
- <result property="actualLoadStart" column="actual_load_start" />
- <result property="shipperRegionLabel" column="shipper_region_label" />
- <result property="receiverAddress" column="receiver_address" />
- <result property="actualUnloadEnd" column="actual_unload_end" />
- <result property="receiverRegionCode" column="receiver_region_code" />
- <result property="actualDeparture" column="actual_departure" />
- <result property="actualArrival" column="actual_arrival" />
- <result property="actualQuantity" column="actual_quantity" />
- <result property="actualWeight" column="actual_weight" />
- <result property="receiverRegionLabel" column="receiver_region_label" />
- <result property="actualVolume" column="actual_volume" />
- <result property="reweighWeight" column="reweigh_weight" />
- <result property="containerId" column="container_id" />
- <result property="electronicLock" column="electronic_lock" />
- <result property="emptyMileage" column="empty_mileage" />
- <result property="shelfId" column="shelf_id" />
- <result property="emptyFuel" column="empty_fuel" />
- <result property="shelfCode" column="shelf_code" />
- <result property="loadedMileage" column="loaded_mileage" />
- <result property="loadedFuel" column="loaded_fuel" />
- <result property="shiftNo" column="shift_no" />
- <result property="lineNo" column="line_no" />
- <result property="status" column="status" />
- <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="accountsReceivableStatus" column="accounts_receivable_status" />
- <result property="accountsPayableStatus" column="accounts_payable_status" />
- <result property="collectionPlanId" column="collection_plan_id" />
- <result property="paymentPlanId" column="payment_plan_id" />
- <result property="isCustoms" column="is_customs" />
- <result property="startRegionCode" column="start_region_code" />
- <result property="endRegionCode" column="end_region_code" />
- <result property="quoteDetailId" column="quote_detail_id" />
- <result property="operationMode" column="operation_mode" />
- <result property="quotePlanId" column="quote_plan_id" />
- <result property="okTime" column="ok_time" />
- <result property="confirmTime" column="confirm_time" />
- <result property="isLoad" column="is_load" />
- <result property="commissionModel" column="commission_model" />
-
- </resultMap>
-
- <sql id="selectTmsDispatchOrderVo">
- select thisTab.id, thisTab.dispatch_no, thisTab.customer_id, thisTab.customer_name, thisTab.customer_code, thisTab.project_id, thisTab.project_name, thisTab.contract_id, thisTab.contract_name, thisTab.order_type, thisTab.transport_line, thisTab.sign_type, thisTab.vehicle_provider_id, thisTab.vehicle_provider_name, thisTab.loading_service_provider_id, thisTab.loading_service_provider_name, thisTab.customs_service_provider_id, thisTab.customs_service_provider_name, thisTab.is_urgent, thisTab.transport_type, thisTab.load_method, thisTab.main_driver_id, thisTab.main_driver_name, thisTab.assistant_driver_id, thisTab.required_vehicle_types, thisTab.assistant_driver_name, thisTab.vehicle_id, thisTab.container_no, thisTab.license_plate, thisTab.shipper_id, thisTab.earliest_departure, thisTab.shipper_name, thisTab.latest_departure, thisTab.shipper_mobile, thisTab.earliest_arrival, thisTab.shipper_address, thisTab.latest_arrival, thisTab.departure_address, thisTab.shipper_region_code, thisTab.receiver_id, thisTab.destination_address, thisTab.receiver_name, thisTab.actual_vehicle_type, thisTab.receiver_mobile, thisTab.actual_load_start, thisTab.shipper_region_label, thisTab.receiver_address, thisTab.actual_unload_end, thisTab.receiver_region_code, thisTab.actual_departure, thisTab.actual_arrival, thisTab.actual_quantity, thisTab.actual_weight, thisTab.receiver_region_label, thisTab.actual_volume, thisTab.reweigh_weight, thisTab.container_id, thisTab.electronic_lock, thisTab.empty_mileage, thisTab.shelf_id, thisTab.empty_fuel, thisTab.shelf_code, thisTab.loaded_mileage, thisTab.loaded_fuel, thisTab.shift_no, thisTab.line_no, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark, thisTab.accounts_receivable_status, thisTab.accounts_payable_status, thisTab.collection_plan_id, thisTab.payment_plan_id , thisTab.is_customs, thisTab.start_region_code, thisTab.end_region_code, thisTab.quote_detail_id, thisTab.operation_mode, thisTab.quote_plan_id, thisTab.ok_time, thisTab.confirm_time, thisTab.is_load ,thisTab.commission_model from tms_dispatch_order AS thisTab
- </sql>
- <sql id="selectTmsDispatchOrderVoCount">
- select count(0) from tms_dispatch_order as thisTab
- </sql>
-
- <sql id="whereCondition">
- <if test="dispatchNo != null and dispatchNo != ''"> and thisTab.dispatch_no = #{dispatchNo}</if>
- <if test="customerId != null "> and thisTab.customer_id = #{customerId}</if>
- <if test="customerCode != null and customerCode != ''"> and thisTab.customer_code = #{customerCode}</if>
- <if test="customerName != null and customerName != ''"> and thisTab.customer_name like concat('%', #{customerName}, '%')</if>
- <if test="projectName != null and projectName != ''"> and thisTab.project_name like concat('%', #{projectName}, '%')</if>
- <if test="projectId != null "> and thisTab.project_id = #{projectId}</if>
- <if test="contractId != null "> and thisTab.contract_id = #{contractId}</if>
- <if test="contractName != null and contractName != ''"> and thisTab.contract_name like concat('%', #{contractName}, '%')</if>
- <if test="transportLine != null and transportLine != '' "> and thisTab.transport_line = #{transportLine}</if>
- <if test="orderType != null "> and thisTab.order_type = #{orderType}</if>
- <if test="signType != null "> and thisTab.sign_type = #{signType}</if>
- <if test="vehicleProviderId != null "> and thisTab.vehicle_provider_id = #{vehicleProviderId}</if>
- <if test="vehicleProviderName != null and vehicleProviderName != ''"> and thisTab.vehicle_provider_name like concat('%', #{vehicleProviderName}, '%')</if>
- <if test="loadingServiceProviderId != null "> and thisTab.loading_service_provider_id = #{loadingServiceProviderId}</if>
- <if test="loadingServiceProviderName != null and loadingServiceProviderName != ''"> and thisTab.loading_service_provider_name like concat('%', #{loadingServiceProviderName}, '%')</if>
- <if test="customsServiceProviderId != null "> and thisTab.customs_service_provider_id = #{customsServiceProviderId}</if>
- <if test="customsServiceProviderName != null and customsServiceProviderName != ''"> and thisTab.customs_service_provider_name like concat('%', #{customsServiceProviderName}, '%')</if>
- <if test="isUrgent != null "> and thisTab.is_urgent = #{isUrgent}</if>
- <if test="transportType != null "> and thisTab.transport_type = #{transportType}</if>
- <if test="loadMethod != null "> and thisTab.load_method = #{loadMethod}</if>
- <if test="mainDriverId != null "> and thisTab.main_driver_id = #{mainDriverId}</if>
- <if test="mainDriverName != null and mainDriverName != ''"> and thisTab.main_driver_name like concat('%', #{mainDriverName}, '%')</if>
- <if test="assistantDriverId != null "> and thisTab.assistant_driver_id = #{assistantDriverId}</if>
- <if test="assistantDriverName != null and assistantDriverName != ''"> and thisTab.assistant_driver_name like concat('%', #{assistantDriverName}, '%')</if>
- <if test="requiredVehicleTypes != null and requiredVehicleTypes != ''"> and thisTab.required_vehicle_types = #{requiredVehicleTypes}</if>
- <if test="vehicleId != null "> and thisTab.vehicle_id = #{vehicleId}</if>
- <if test="licensePlate != null and licensePlate != ''"> and thisTab.license_plate = #{licensePlate}</if>
- <if test="shipperId != null "> and thisTab.shipper_id = #{shipperId}</if>
- <if test="shipperName != null and shipperName != ''"> and thisTab.shipper_name like concat('%', #{shipperName}, '%')</if>
- <if test="shipperMobile != null and shipperMobile != ''"> and thisTab.shipper_mobile = #{shipperMobile}</if>
- <if test="shipperAddress != null and shipperAddress != ''"> and thisTab.shipper_address = #{shipperAddress}</if>
- <if test="shipperRegionCode != null and shipperRegionCode != ''"> and thisTab.shipper_region_code = #{shipperRegionCode}</if>
- <if test="shipperRegionLabel != null and shipperRegionLabel != ''"> and thisTab.shipper_region_label = #{shipperRegionLabel}</if>
- <if test="receiverId != null "> and thisTab.receiver_id = #{receiverId}</if>
- <if test="receiverName != null and receiverName != ''"> and thisTab.receiver_name like concat('%', #{receiverName}, '%')</if>
- <if test="receiverMobile != null and receiverMobile != ''"> and thisTab.receiver_mobile = #{receiverMobile}</if>
- <if test="receiverAddress != null and receiverAddress != ''"> and thisTab.receiver_address = #{receiverAddress}</if>
- <if test="receiverRegionCode != null and receiverRegionCode != ''"> and thisTab.receiver_region_code = #{receiverRegionCode}</if>
- <if test="receiverRegionLabel != null and receiverRegionLabel != ''"> and thisTab.receiver_region_label = #{receiverRegionLabel}</if>
- <if test="containerId != null "> and thisTab.container_id = #{containerId}</if>
- <if test="shelfId != null "> and thisTab.shelf_id = #{shelfId}</if>
- <if test="shelfCode != null and shelfCode != ''"> and thisTab.shelf_code = #{shelfCode}</if>
- <if test="status != null "> and thisTab.status = #{status}</if>
- <if test="accountsReceivableStatus != null "> and thisTab.accounts_receivable_status = #{accountsReceivableStatus}</if>
- <if test="accountsPayableStatus != null "> and thisTab.accounts_payable_status = #{accountsPayableStatus}</if>
- <if test="collectionPlanId != null "> and thisTab.collection_plan_id = #{collectionPlanId}</if>
- <if test="paymentPlanId != null "> and thisTab.payment_plan_id = #{paymentPlanId}</if>
- <if test="isCustoms != null "> and thisTab.is_customs = #{isCustoms}</if>
- <if test="startRegionCode != null "> and thisTab.start_region_code = #{startRegionCode}</if>
- <if test="endRegionCode != null "> and thisTab.end_region_code = #{endRegionCode}</if>
- <if test="quoteDetailId != null "> and thisTab.quote_detail_id = #{quoteDetailId}</if>
- <if test="operationMode != null "> and thisTab.operation_mode = #{operationMode}</if>
- <if test="quotePlanId != null "> and thisTab.quote_plan_id = #{quotePlanId}</if>
-
- <if test="createTimeBegin != null and createTimeBegin != '' and createTimeEnd != null and createTimeEnd != ''"> and thisTab.create_time between #{createTimeBegin} and #{createTimeEnd}</if>
- <if test="updateTimeBegin != null and updateTimeBegin != '' and updateTimeEnd != null and updateTimeEnd != ''"> and thisTab.update_time between #{updateTimeBegin} and #{updateTimeEnd}</if>
- <if test="confirmTimeBegin != null and confirmTimeBegin != '' and confirmTimeEnd != null and confirmTimeEnd != ''"> and thisTab.confirm_time between #{confirmTimeBegin} and #{confirmTimeEnd}</if>
- <if test="okTimeBegin != null and okTimeBegin != '' and okTimeEnd != null and okTimeEnd != ''"> and thisTab.ok_time between #{okTimeBegin} and #{okTimeEnd}</if>
-
- <if test="isLoad != null "> and thisTab.is_load = #{isLoad}</if>
- <if test="commissionModel != null "> and thisTab.commission_model = #{commissionModel}</if>
- </sql>
-
- <!--鏌ヨ-->
- <select id="selectTmsDispatchOrderById" parameterType="Integer" resultMap="TmsDispatchOrderResult">
- <include refid="selectTmsDispatchOrderVo"/>
- where id = #{id}
- </select>
-
- <select id="selectTmsDispatchOrderCount" parameterType="com.ruoyi.tms.domain.TmsDispatchOrder" resultType="int">
- <include refid="selectTmsDispatchOrderVoCount"/>
- <where>
- <include refid="whereCondition"/>
- </where>
- </select>
-
- <select id="selectTmsDispatchOrderList" parameterType="com.ruoyi.tms.domain.TmsDispatchOrder" resultMap="TmsDispatchOrderResult">
- <include refid="selectTmsDispatchOrderVo"/>
- <where>
- <include refid="whereCondition"/>
- </where>
- order by thisTab.id desc
- </select>
- <insert id="insertTmsDispatchOrder" parameterType="com.ruoyi.tms.domain.TmsDispatchOrder" useGeneratedKeys="true" keyProperty="id">
- insert into tms_dispatch_order
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="dispatchNo != null and dispatchNo != ''">dispatch_no,</if>
- <if test="customerId != null">customer_id,</if>
- <if test="customerName != null">customer_name,</if>
- <if test="customerCode != null">customer_code,</if>
- <if test="projectId != null">project_id,</if>
- <if test="projectName != null and projectName != ''">project_name,</if>
- <if test="contractId != null">contract_id,</if>
- <if test="contractName != null and contractName != ''">contract_name,</if>
- <if test="orderType != null">order_type,</if>
- <if test="transportLine != null">transport_line,</if>
- <if test="signType != null">sign_type,</if>
- <if test="vehicleProviderId != null">vehicle_provider_id,</if>
- <if test="vehicleProviderName != null and vehicleProviderName != ''">vehicle_provider_name,</if>
- <if test="loadingServiceProviderId != null">loading_service_provider_id,</if>
- <if test="loadingServiceProviderName != null and loadingServiceProviderName != ''">loading_service_provider_name,</if>
- <if test="customsServiceProviderId != null">customs_service_provider_id,</if>
- <if test="customsServiceProviderName != null and customsServiceProviderName != ''">customs_service_provider_name,</if>
- <if test="isUrgent != null">is_urgent,</if>
- <if test="transportType != null">transport_type,</if>
- <if test="loadMethod != null">load_method,</if>
- <if test="mainDriverId != null">main_driver_id,</if>
- <if test="mainDriverName != null and mainDriverName != ''">main_driver_name,</if>
- <if test="assistantDriverId != null">assistant_driver_id,</if>
- <if test="requiredVehicleTypes != null and requiredVehicleTypes != ''">required_vehicle_types,</if>
- <if test="assistantDriverName != null">assistant_driver_name,</if>
- <if test="vehicleId != null">vehicle_id,</if>
- <if test="containerNo != null">container_no,</if>
- <if test="licensePlate != null and licensePlate != ''">license_plate,</if>
- <if test="shipperId != null">shipper_id,</if>
- <if test="earliestDeparture != null">earliest_departure,</if>
- <if test="shipperName != null">shipper_name,</if>
- <if test="latestDeparture != null">latest_departure,</if>
- <if test="shipperMobile != null">shipper_mobile,</if>
- <if test="earliestArrival != null">earliest_arrival,</if>
- <if test="shipperAddress != null">shipper_address,</if>
- <if test="latestArrival != null">latest_arrival,</if>
- <if test="departureAddress != null">departure_address,</if>
- <if test="shipperRegionCode != null">shipper_region_code,</if>
- <if test="receiverId != null">receiver_id,</if>
- <if test="destinationAddress != null">destination_address,</if>
- <if test="receiverName != null">receiver_name,</if>
- <if test="actualVehicleType != null and actualVehicleType != ''">actual_vehicle_type,</if>
- <if test="receiverMobile != null">receiver_mobile,</if>
- <if test="actualLoadStart != null">actual_load_start,</if>
- <if test="shipperRegionLabel != null">shipper_region_label,</if>
- <if test="receiverAddress != null">receiver_address,</if>
- <if test="actualUnloadEnd != null">actual_unload_end,</if>
- <if test="receiverRegionCode != null">receiver_region_code,</if>
- <if test="actualDeparture != null">actual_departure,</if>
- <if test="actualArrival != null">actual_arrival,</if>
- <if test="actualQuantity != null">actual_quantity,</if>
- <if test="actualWeight != null">actual_weight,</if>
- <if test="receiverRegionLabel != null">receiver_region_label,</if>
- <if test="actualVolume != null">actual_volume,</if>
- <if test="reweighWeight != null">reweigh_weight,</if>
- <if test="containerId != null">container_id,</if>
- <if test="electronicLock != null">electronic_lock,</if>
- <if test="emptyMileage != null">empty_mileage,</if>
- <if test="shelfId != null">shelf_id,</if>
- <if test="emptyFuel != null">empty_fuel,</if>
- <if test="shelfCode != null">shelf_code,</if>
- <if test="loadedMileage != null">loaded_mileage,</if>
- <if test="loadedFuel != null">loaded_fuel,</if>
- <if test="shiftNo != null">shift_no,</if>
- <if test="lineNo != null">line_no,</if>
- <if test="status != null">status,</if>
- <if test="createBy != null">create_by,</if>
- <if test="createTime != null">create_time,</if>
- <if test="updateBy != null">update_by,</if>
- <if test="updateTime != null">update_time,</if>
- <if test="remark != null">remark,</if>
- <if test="accountsReceivableStatus != null">accounts_receivable_status,</if>
- <if test="accountsPayableStatus != null">accounts_payable_status,</if>
- <if test="collectionPlanId != null">collection_plan_id,</if>
- <if test="paymentPlanId != null">payment_plan_id,</if>
- <if test="isCustoms != null">is_customs,</if>
- <if test="startRegionCode != null">start_region_code,</if>
- <if test="endRegionCode != null">end_region_code,</if>
- <if test="quoteDetailId != null">quote_detail_id,</if>
- <if test="operationMode != null">operation_mode,</if>
- <if test="quotePlanId != null">quote_plan_id,</if>
- <if test="isLoad != null">is_load,</if>
- <if test="commissionModel != null">commission_model,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="dispatchNo != null and dispatchNo != ''">#{dispatchNo},</if>
- <if test="customerId != null">#{customerId},</if>
- <if test="customerName != null">#{customerName},</if>
- <if test="customerCode != null">#{customerCode},</if>
- <if test="projectId != null">#{projectId},</if>
- <if test="projectName != null and projectName != ''">#{projectName},</if>
- <if test="contractId != null">#{contractId},</if>
- <if test="contractName != null and contractName != ''">#{contractName},</if>
- <if test="orderType != null">#{orderType},</if>
- <if test="transportLine != null">#{transportLine},</if>
- <if test="signType != null">#{signType},</if>
- <if test="vehicleProviderId != null">#{vehicleProviderId},</if>
- <if test="vehicleProviderName != null and vehicleProviderName != ''">#{vehicleProviderName},</if>
- <if test="loadingServiceProviderId != null">#{loadingServiceProviderId},</if>
- <if test="loadingServiceProviderName != null and loadingServiceProviderName != ''">#{loadingServiceProviderName},</if>
- <if test="customsServiceProviderId != null">#{customsServiceProviderId},</if>
- <if test="customsServiceProviderName != null and customsServiceProviderName != ''">#{customsServiceProviderName},</if>
- <if test="isUrgent != null">#{isUrgent},</if>
- <if test="transportType != null">#{transportType},</if>
- <if test="loadMethod != null">#{loadMethod},</if>
- <if test="mainDriverId != null">#{mainDriverId},</if>
- <if test="mainDriverName != null and mainDriverName != ''">#{mainDriverName},</if>
- <if test="assistantDriverId != null">#{assistantDriverId},</if>
- <if test="requiredVehicleTypes != null and requiredVehicleTypes != ''">#{requiredVehicleTypes},</if>
- <if test="assistantDriverName != null">#{assistantDriverName},</if>
- <if test="vehicleId != null">#{vehicleId},</if>
- <if test="containerNo != null">#{containerNo},</if>
- <if test="licensePlate != null and licensePlate != ''">#{licensePlate},</if>
- <if test="shipperId != null">#{shipperId},</if>
- <if test="earliestDeparture != null">#{earliestDeparture},</if>
- <if test="shipperName != null">#{shipperName},</if>
- <if test="latestDeparture != null">#{latestDeparture},</if>
- <if test="shipperMobile != null">#{shipperMobile},</if>
- <if test="earliestArrival != null">#{earliestArrival},</if>
- <if test="shipperAddress != null">#{shipperAddress},</if>
- <if test="latestArrival != null">#{latestArrival},</if>
- <if test="departureAddress != null">#{departureAddress},</if>
- <if test="shipperRegionCode != null">#{shipperRegionCode},</if>
- <if test="receiverId != null">#{receiverId},</if>
- <if test="destinationAddress != null">#{destinationAddress},</if>
- <if test="receiverName != null">#{receiverName},</if>
- <if test="actualVehicleType != null and actualVehicleType != ''">#{actualVehicleType},</if>
- <if test="receiverMobile != null">#{receiverMobile},</if>
- <if test="actualLoadStart != null">#{actualLoadStart},</if>
- <if test="shipperRegionLabel != null">#{shipperRegionLabel},</if>
- <if test="receiverAddress != null">#{receiverAddress},</if>
- <if test="actualUnloadEnd != null">#{actualUnloadEnd},</if>
- <if test="receiverRegionCode != null">#{receiverRegionCode},</if>
- <if test="actualDeparture != null">#{actualDeparture},</if>
- <if test="actualArrival != null">#{actualArrival},</if>
- <if test="actualQuantity != null">#{actualQuantity},</if>
- <if test="actualWeight != null">#{actualWeight},</if>
- <if test="receiverRegionLabel != null">#{receiverRegionLabel},</if>
- <if test="actualVolume != null">#{actualVolume},</if>
- <if test="reweighWeight != null">#{reweighWeight},</if>
- <if test="containerId != null">#{containerId},</if>
- <if test="electronicLock != null">#{electronicLock},</if>
- <if test="emptyMileage != null">#{emptyMileage},</if>
- <if test="shelfId != null">#{shelfId},</if>
- <if test="emptyFuel != null">#{emptyFuel},</if>
- <if test="shelfCode != null">#{shelfCode},</if>
- <if test="loadedMileage != null">#{loadedMileage},</if>
- <if test="loadedFuel != null">#{loadedFuel},</if>
- <if test="shiftNo != null">#{shiftNo},</if>
- <if test="lineNo != null">#{lineNo},</if>
- <if test="status != null">#{status},</if>
- <if test="createBy != null">#{createBy},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="updateBy != null">#{updateBy},</if>
- <if test="updateTime != null">#{updateTime},</if>
- <if test="remark != null">#{remark},</if>
- <if test="accountsReceivableStatus != null">#{accountsReceivableStatus},</if>
- <if test="accountsPayableStatus != null">#{accountsPayableStatus},</if>
- <if test="collectionPlanId != null">#{collectionPlanId},</if>
- <if test="paymentPlanId != null">#{paymentPlanId},</if>
- <if test="isCustoms != null">#{isCustoms},</if>
- <if test="startRegionCode != null">#{startRegionCode},</if>
- <if test="endRegionCode != null">#{endRegionCode},</if>
- <if test="quoteDetailId != null">#{quoteDetailId},</if>
- <if test="operationMode != null">#{operationMode},</if>
- <if test="quotePlanId != null">#{quotePlanId},</if>
- <if test="isLoad != null">#{isLoad},</if>
- <if test="commissionModel != null">#{commissionModel},</if>
- </trim>
- </insert>
-
- <insert id="insertTmsDispatchOrderBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
- insert into tms_dispatch_order
- <trim prefix="(" suffix=") values" suffixOverrides=",">
- id,dispatch_no,customer_id,customer_name,customer_code,project_id,project_name,contract_id,contract_name,order_type,transport_line,sign_type,vehicle_provider_id,vehicle_provider_name,loading_service_provider_id,loading_service_provider_name,customs_service_provider_id,customs_service_provider_name,is_urgent,transport_type,load_method,main_driver_id,main_driver_name,assistant_driver_id,required_vehicle_types,assistant_driver_name,vehicle_id,container_no,license_plate,shipper_id,earliest_departure,shipper_name,latest_departure,shipper_mobile,earliest_arrival,shipper_address,latest_arrival,departure_address,shipper_region_code,receiver_id,destination_address,receiver_name,actual_vehicle_type,receiver_mobile,actual_load_start,shipper_region_label,receiver_address,actual_unload_end,receiver_region_code,actual_departure,actual_arrival,actual_quantity,actual_weight,receiver_region_label,actual_volume,reweigh_weight,container_id,electronic_lock,empty_mileage,shelf_id,empty_fuel,shelf_code,loaded_mileage,loaded_fuel,shift_no,line_no,status,create_by,create_time,update_by,update_time,remark,accounts_receivable_status,accounts_payable_status,collection_plan_id,payment_plan_id,is_customs,start_region_code,end_region_code,quote_detail_id,operation_mode,quote_plan_id,is_load,commission_model
- </trim>
- <foreach item="item" index="index" collection="list" separator=",">
- <trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.dispatchNo},#{item.customerId},#{item.customerName},#{item.customerCode},#{item.projectId},#{item.projectName},#{item.contractId},#{item.contractName},#{item.orderType},#{item.transportLine},#{item.signType},#{item.vehicleProviderId},#{item.vehicleProviderName},#{item.loadingServiceProviderId},#{item.loadingServiceProviderName},#{item.customsServiceProviderId},#{item.customsServiceProviderName},#{item.isUrgent},#{item.transportType},#{item.loadMethod},#{item.mainDriverId},#{item.mainDriverName},#{item.assistantDriverId},#{item.requiredVehicleTypes},#{item.assistantDriverName},#{item.vehicleId},#{item.containerNo},#{item.licensePlate},#{item.shipperId},#{item.earliestDeparture},#{item.shipperName},#{item.latestDeparture},#{item.shipperMobile},#{item.earliestArrival},#{item.shipperAddress},#{item.latestArrival},#{item.departureAddress},#{item.shipperRegionCode},#{item.receiverId},#{item.destinationAddress},#{item.receiverName},#{item.actualVehicleType},#{item.receiverMobile},#{item.actualLoadStart},#{item.shipperRegionLabel},#{item.receiverAddress},#{item.actualUnloadEnd},#{item.receiverRegionCode},#{item.actualDeparture},#{item.actualArrival},#{item.actualQuantity},#{item.actualWeight},#{item.receiverRegionLabel},#{item.actualVolume},#{item.reweighWeight},#{item.containerId},#{item.electronicLock},#{item.emptyMileage},#{item.shelfId},#{item.emptyFuel},#{item.shelfCode},#{item.loadedMileage},#{item.loadedFuel},#{item.shiftNo},#{item.lineNo},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.accountsReceivableStatus},#{item.accountsPayableStatus},#{item.collectionPlanId},#{item.paymentPlanId},#{item.isCustoms},#{item.startRegionCode},#{item.endRegionCode},#{item.quoteDetailId},#{item.operationMode},#{item.quotePlanId},#{item.isLoad},#{item.commissionModel}
- </trim>
- </foreach>
- </insert>
-
- <!-- 淇敼 -->
- <update id="updateTmsDispatchOrder" parameterType="com.ruoyi.tms.domain.TmsDispatchOrder">
- update tms_dispatch_order
- <trim prefix="SET" suffixOverrides=",">
- <if test="dispatchNo != null and dispatchNo != ''">dispatch_no = #{dispatchNo},</if>
- <if test="customerId != null">customer_id = #{customerId},</if>
- <if test="customerName != null">customer_name = #{customerName},</if>
- <if test="customerCode != null">customer_code = #{customerCode},</if>
- <if test="projectId != null">project_id = #{projectId},</if>
- <if test="projectName != null and projectName != ''">project_name = #{projectName},</if>
- <if test="contractId != null">contract_id = #{contractId},</if>
- <if test="contractName != null and contractName != ''">contract_name = #{contractName},</if>
- <if test="orderType != null">order_type = #{orderType},</if>
- <if test="transportLine != null">transport_line = #{transportLine},</if>
- <if test="signType != null">sign_type = #{signType},</if>
- <if test="vehicleProviderId != null">vehicle_provider_id = #{vehicleProviderId},</if>
- <if test="vehicleProviderName != null and vehicleProviderName != ''">vehicle_provider_name = #{vehicleProviderName},</if>
- <if test="loadingServiceProviderId != null">loading_service_provider_id = #{loadingServiceProviderId},</if>
- <if test="loadingServiceProviderName != null and loadingServiceProviderName != ''">loading_service_provider_name = #{loadingServiceProviderName},</if>
- <if test="customsServiceProviderId != null">customs_service_provider_id = #{customsServiceProviderId},</if>
- <if test="customsServiceProviderName != null and customsServiceProviderName != ''">customs_service_provider_name = #{customsServiceProviderName},</if>
- <if test="isUrgent != null">is_urgent = #{isUrgent},</if>
- <if test="transportType != null">transport_type = #{transportType},</if>
- <if test="loadMethod != null">load_method = #{loadMethod},</if>
- <if test="mainDriverId != null">main_driver_id = #{mainDriverId},</if>
- <if test="mainDriverName != null and mainDriverName != ''">main_driver_name = #{mainDriverName},</if>
- <if test="assistantDriverId != null">assistant_driver_id = #{assistantDriverId},</if>
- <if test="requiredVehicleTypes != null and requiredVehicleTypes != ''">required_vehicle_types = #{requiredVehicleTypes},</if>
- <if test="assistantDriverName != null">assistant_driver_name = #{assistantDriverName},</if>
- <if test="vehicleId != null">vehicle_id = #{vehicleId},</if>
- <if test="containerNo != null">container_no = #{containerNo},</if>
- <if test="licensePlate != null and licensePlate != ''">license_plate = #{licensePlate},</if>
- <if test="shipperId != null">shipper_id = #{shipperId},</if>
- <if test="earliestDeparture != null">earliest_departure = #{earliestDeparture},</if>
- <if test="shipperName != null">shipper_name = #{shipperName},</if>
- <if test="latestDeparture != null">latest_departure = #{latestDeparture},</if>
- <if test="shipperMobile != null">shipper_mobile = #{shipperMobile},</if>
- <if test="earliestArrival != null">earliest_arrival = #{earliestArrival},</if>
- <if test="shipperAddress != null">shipper_address = #{shipperAddress},</if>
- <if test="latestArrival != null">latest_arrival = #{latestArrival},</if>
- <if test="departureAddress != null">departure_address = #{departureAddress},</if>
- <if test="shipperRegionCode != null">shipper_region_code = #{shipperRegionCode},</if>
- <if test="receiverId != null">receiver_id = #{receiverId},</if>
- <if test="destinationAddress != null">destination_address = #{destinationAddress},</if>
- <if test="receiverName != null">receiver_name = #{receiverName},</if>
- <if test="actualVehicleType != null and actualVehicleType != ''">actual_vehicle_type = #{actualVehicleType},</if>
- <if test="receiverMobile != null">receiver_mobile = #{receiverMobile},</if>
- <if test="actualLoadStart != null">actual_load_start = #{actualLoadStart},</if>
- <if test="shipperRegionLabel != null">shipper_region_label = #{shipperRegionLabel},</if>
- <if test="receiverAddress != null">receiver_address = #{receiverAddress},</if>
- <if test="actualUnloadEnd != null">actual_unload_end = #{actualUnloadEnd},</if>
- <if test="receiverRegionCode != null">receiver_region_code = #{receiverRegionCode},</if>
- <if test="actualDeparture != null">actual_departure = #{actualDeparture},</if>
- <if test="actualArrival != null">actual_arrival = #{actualArrival},</if>
- <if test="actualQuantity != null">actual_quantity = #{actualQuantity},</if>
- <if test="actualWeight != null">actual_weight = #{actualWeight},</if>
- <if test="receiverRegionLabel != null">receiver_region_label = #{receiverRegionLabel},</if>
- <if test="actualVolume != null">actual_volume = #{actualVolume},</if>
- <if test="reweighWeight != null">reweigh_weight = #{reweighWeight},</if>
- <if test="containerId != null">container_id = #{containerId},</if>
- <if test="electronicLock != null">electronic_lock = #{electronicLock},</if>
- <if test="emptyMileage != null">empty_mileage = #{emptyMileage},</if>
- <if test="shelfId != null">shelf_id = #{shelfId},</if>
- <if test="emptyFuel != null">empty_fuel = #{emptyFuel},</if>
- <if test="shelfCode != null">shelf_code = #{shelfCode},</if>
- <if test="loadedMileage != null">loaded_mileage = #{loadedMileage},</if>
- <if test="loadedFuel != null">loaded_fuel = #{loadedFuel},</if>
- <if test="shiftNo != null">shift_no = #{shiftNo},</if>
- <if test="lineNo != null">line_no = #{lineNo},</if>
- <if test="status != null">status = #{status},</if>
- <if test="createBy != null">create_by = #{createBy},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
- <if test="updateBy != null">update_by = #{updateBy},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="accountsReceivableStatus != null">accounts_receivable_status = #{accountsReceivableStatus},</if>
- <if test="accountsPayableStatus != null">accounts_payable_status = #{accountsPayableStatus},</if>
- <if test="collectionPlanId != null">collection_plan_id = #{collectionPlanId},</if>
- <if test="paymentPlanId != null">payment_plan_id = #{paymentPlanId},</if>
- <if test="isCustoms != null">is_customs = #{isCustoms},</if>
- <if test="startRegionCode != null">start_region_code = #{startRegionCode},</if>
- <if test="endRegionCode != null">end_region_code = #{endRegionCode},</if>
- <if test="quoteDetailId != null">quote_detail_id = #{quoteDetailId},</if>
- <if test="operationMode != null">operation_mode = #{operationMode},</if>
- <if test="quotePlanId != null">quote_plan_id = #{quotePlanId},</if>
- <if test="confirmTime != null">confirm_time = #{confirmTime},</if>
- <if test="okTime != null">ok_time = #{okTime},</if>
- <if test="isLoad != null">is_load = #{isLoad},</if>
- <if test="commissionModel != null">commission_model = #{commissionModel},</if>
-
- </trim>
- where id = #{id}
- </update>
- <!-- 淇敼 -->
- <update id="updateTmsDispatchOrderBatch" parameterType="java.util.List">
- <foreach collection="list" item="item" index="index" separator=";">
- update tms_dispatch_order
- <trim prefix="SET" suffixOverrides=",">
- <if test="item.dispatchNo != null and item.dispatchNo != ''">dispatch_no = #{item.dispatchNo},</if>
- <if test="item.customerId != null">customer_id = #{item.customerId},</if>
- <if test="item.customerName != null">customer_name = #{item.customerName},</if>
- <if test="item.customerCode != null">customer_code = #{item.customerCode},</if>
- <if test="item.projectId != null">project_id = #{item.projectId},</if>
- <if test="item.projectName != null and item.projectName != ''">project_name = #{item.projectName},</if>
- <if test="item.contractId != null">contract_id = #{item.contractId},</if>
- <if test="item.contractName != null and item.contractName != ''">contract_name = #{item.contractName},</if>
- <if test="item.orderType != null">order_type = #{item.orderType},</if>
- <if test="item.transportLine != null">transport_line = #{item.transportLine},</if>
- <if test="item.signType != null">sign_type = #{item.signType},</if>
- <if test="item.vehicleProviderId != null">vehicle_provider_id = #{item.vehicleProviderId},</if>
- <if test="item.vehicleProviderName != null and item.vehicleProviderName != ''">vehicle_provider_name = #{item.vehicleProviderName},</if>
- <if test="item.loadingServiceProviderId != null">loading_service_provider_id = #{item.loadingServiceProviderId},</if>
- <if test="item.loadingServiceProviderName != null and item.loadingServiceProviderName != ''">loading_service_provider_name = #{item.loadingServiceProviderName},</if>
- <if test="item.customsServiceProviderId != null">customs_service_provider_id = #{item.customsServiceProviderId},</if>
- <if test="item.customsServiceProviderName != null and item.customsServiceProviderName != ''">customs_service_provider_name = #{item.customsServiceProviderName},</if>
- <if test="item.isUrgent != null">is_urgent = #{item.isUrgent},</if>
- <if test="item.transportType != null">transport_type = #{item.transportType},</if>
- <if test="item.loadMethod != null">load_method = #{item.loadMethod},</if>
- <if test="item.mainDriverId != null">main_driver_id = #{item.mainDriverId},</if>
- <if test="item.mainDriverName != null and item.mainDriverName != ''">main_driver_name = #{item.mainDriverName},</if>
- <if test="item.assistantDriverId != null">assistant_driver_id = #{item.assistantDriverId},</if>
- <if test="item.requiredVehicleTypes != null and item.requiredVehicleTypes != ''">required_vehicle_types = #{item.requiredVehicleTypes},</if>
- <if test="item.assistantDriverName != null">assistant_driver_name = #{item.assistantDriverName},</if>
- <if test="item.vehicleId != null">vehicle_id = #{item.vehicleId},</if>
- <if test="item.containerNo != null">container_no = #{item.containerNo},</if>
- <if test="item.licensePlate != null and item.licensePlate != ''">license_plate = #{item.licensePlate},</if>
- <if test="item.shipperId != null">shipper_id = #{item.shipperId},</if>
- <if test="item.earliestDeparture != null">earliest_departure = #{item.earliestDeparture},</if>
- <if test="item.shipperName != null">shipper_name = #{item.shipperName},</if>
- <if test="item.latestDeparture != null">latest_departure = #{item.latestDeparture},</if>
- <if test="item.shipperMobile != null">shipper_mobile = #{item.shipperMobile},</if>
- <if test="item.earliestArrival != null">earliest_arrival = #{item.earliestArrival},</if>
- <if test="item.shipperAddress != null">shipper_address = #{item.shipperAddress},</if>
- <if test="item.latestArrival != null">latest_arrival = #{item.latestArrival},</if>
- <if test="item.departureAddress != null">departure_address = #{item.departureAddress},</if>
- <if test="item.shipperRegionCode != null">shipper_region_code = #{item.shipperRegionCode},</if>
- <if test="item.receiverId != null">receiver_id = #{item.receiverId},</if>
- <if test="item.destinationAddress != null">destination_address = #{item.destinationAddress},</if>
- <if test="item.receiverName != null">receiver_name = #{item.receiverName},</if>
- <if test="item.actualVehicleType != null and actualVehicleType != ''">actual_vehicle_type = #{item.actualVehicleType},</if>
- <if test="item.receiverMobile != null">receiver_mobile = #{item.receiverMobile},</if>
- <if test="item.actualLoadStart != null">actual_load_start = #{item.actualLoadStart},</if>
- <if test="item.shipperRegionLabel != null">shipper_region_label = #{item.shipperRegionLabel},</if>
- <if test="item.receiverAddress != null">receiver_address = #{item.receiverAddress},</if>
- <if test="item.actualUnloadEnd != null">actual_unload_end = #{item.actualUnloadEnd},</if>
- <if test="item.receiverRegionCode != null">receiver_region_code = #{item.receiverRegionCode},</if>
- <if test="item.actualDeparture != null">actual_departure = #{item.actualDeparture},</if>
- <if test="item.actualArrival != null">actual_arrival = #{item.actualArrival},</if>
- <if test="item.actualQuantity != null">actual_quantity = #{item.actualQuantity},</if>
- <if test="item.actualWeight != null">actual_weight = #{item.actualWeight},</if>
- <if test="item.receiverRegionLabel != null">receiver_region_label = #{item.receiverRegionLabel},</if>
- <if test="item.actualVolume != null">actual_volume = #{item.actualVolume},</if>
- <if test="item.reweighWeight != null">reweigh_weight = #{item.reweighWeight},</if>
- <if test="item.containerId != null">container_id = #{item.containerId},</if>
- <if test="item.electronicLock != null">electronic_lock = #{item.electronicLock},</if>
- <if test="item.emptyMileage != null">empty_mileage = #{item.emptyMileage},</if>
- <if test="item.shelfId != null">shelf_id = #{item.shelfId},</if>
- <if test="item.emptyFuel != null">empty_fuel = #{item.emptyFuel},</if>
- <if test="item.shelfCode != null">shelf_code = #{item.shelfCode},</if>
- <if test="item.loadedMileage != null">loaded_mileage = #{item.loadedMileage},</if>
- <if test="item.loadedFuel != null">loaded_fuel = #{item.loadedFuel},</if>
- <if test="item.shiftNo != null">shift_no = #{item.shiftNo},</if>
- <if test="item.lineNo != null">line_no = #{item.lineNo},</if>
- <if test="item.status != null">status = #{item.status},</if>
- <if test="item.createBy != null">create_by = #{item.createBy},</if>
- <if test="item.createTime != null">create_time = #{item.createTime},</if>
- <if test="item.updateBy != null">update_by = #{item.updateBy},</if>
- <if test="item.updateTime != null">update_time = #{item.updateTime},</if>
- <if test="item.remark != null">remark = #{item.remark},</if>
- <if test="item.accountsReceivableStatus != null">accounts_receivable_status = #{item.accountsReceivableStatus},</if>
- <if test="item.accountsPayableStatus != null">accounts_payable_status = #{item.accountsPayableStatus},</if>
- <if test="item.collectionPlanId != null">collection_plan_id = #{item.collectionPlanId},</if>
- <if test="item.paymentPlanId != null">payment_plan_id = #{item.paymentPlanId},</if>
- <if test="item.isCustoms != null">is_customs = #{item.isCustoms},</if>
- <if test="item.startRegionCode != null">start_region_code = #{item.startRegionCode},</if>
- <if test="item.endRegionCode != null">end_region_code = #{item.endRegionCode},</if>
- <if test="item.quoteDetailId != null">quote_detail_id = #{item.quoteDetailId},</if>
- <if test="item.operationMode != null">operation_mode = #{item.operationMode},</if>
- <if test="item.quotePlanId != null">quote_plan_id = #{item.quotePlanId},</if>
- <if test="item.isLoad != null">is_load = #{item.isLoad},</if>
- <if test="item.commissionModel != null">commission_model = #{item.commissionModel},</if>
- </trim>
- where id = #{item.id}
- </foreach>
- </update>
-
- <!--鍒犻櫎-->
- <delete id="deleteTmsDispatchOrderById" parameterType="Integer">
- delete from tms_dispatch_order where id = #{id}
- </delete>
- <delete id="deleteTmsDispatchOrderByIds" parameterType="Integer">
- delete from tms_dispatch_order where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-
- <select id="selectAssignedItineraryList" resultType="com.ruoyi.tms.domain.vo.DriverDispatchVo">
-
- SELECT tdo.dispatch_no, tdo.customer_name, tdo.license_plate,tdo.transport_line,tdo.status,tdo.latest_departure,
- tdd.status as tddStatus,tdd.driver_id,tdd.dispatch_id,tdo.ok_time
- FROM tms_dispatch_order AS tdo
- LEFT JOIN tms_driver_dispatch AS tdd
- ON tdo.id = tdd.dispatch_id
- where 1 = 1
- <if test="inStatusList != null and inStatusList.size > 0">
- and tdd.status in
- <foreach item="item" collection="inStatusList" open="(" separator="," close=")">
- #{item}
- </foreach>
-
- </if>
- <if test="inTdoStatusList != null and inTdoStatusList.size > 0">
- and tdo.status in
- <foreach item="item" collection="inTdoStatusList" open="(" separator="," close=")">
- #{item}
- </foreach>
-
- </if>
-
-
- and tdd.driver_id = #{driverId};
- </select>
- <select id="selectAssignedItineraryDetail" resultType="com.ruoyi.tms.domain.vo.DriverDispatchVo">
- SELECT tdo.dispatch_no, tdo.customer_name, tdo.license_plate,tdo.transport_line,tdo.status,tdo.latest_departure,
- tdd.status as tddStatus,tdd.driver_id,tdd.dispatch_id,tdo.ok_time,tdo.shelf_code,tdo.shipper_address,tdo.receiver_address
- FROM tms_dispatch_order AS tdo
- LEFT JOIN tms_driver_dispatch AS tdd
- ON tdo.id = tdd.dispatch_id
- where tdo.id = #{dispatchId} and tdd.driver_id = #{driverId};
-
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/tms/src/main/resources/mapper/tms/TmsShelfMapper.xml b/tms/src/main/resources/mapper/tms/TmsShelfMapper.xml
deleted file mode 100644
index 8fdcbcd..0000000
--- a/tms/src/main/resources/mapper/tms/TmsShelfMapper.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.tms.mapper.TmsShelfMapper">
-
- <resultMap type="com.ruoyi.tms.domain.TmsShelf" id="TmsShelfResult">
- <result property="id" column="id" />
- <result property="systemCode" column="system_code" />
- <result property="shelfCode" column="shelf_code" />
- <result property="shelfType" column="shelf_type" />
- <result property="ownerTeamId" column="owner_team_id" />
- <result property="ownerTeamName" column="owner_team_name" />
- <result property="manufacturer" column="manufacturer" />
- <result property="manufactureDate" column="manufacture_date" />
- <result property="lengthMm" column="length_mm" />
- <result property="widthMm" column="width_mm" />
- <result property="heightMm" column="height_mm" />
- <result property="maxLoadKg" column="max_load_kg" />
- <result property="compatibleContainerType" column="compatible_container_type" />
- <result property="isInUse" column="is_in_use" />
- <result property="maintenanceStatus" column="maintenance_status" />
- <result property="lastMaintenanceDate" column="last_maintenance_date" />
- <result property="nextMaintenanceDate" column="next_maintenance_date" />
- <result property="status" column="status" />
- <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="selfLeasType" column="self_leas_type" />
- </resultMap>
-
- <sql id="selectTmsShelfVo">
- select thisTab.id, thisTab.system_code, thisTab.shelf_code, thisTab.shelf_type, thisTab.owner_team_id, thisTab.owner_team_name, thisTab.manufacturer, thisTab.manufacture_date, thisTab.length_mm, thisTab.width_mm, thisTab.height_mm, thisTab.max_load_kg, thisTab.compatible_container_type, thisTab.is_in_use, thisTab.maintenance_status, thisTab.last_maintenance_date, thisTab.next_maintenance_date, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark ,thisTab.self_leas_type from tms_shelf AS thisTab
- </sql>
- <sql id="selectTmsShelfVoCount">
- select count(0) from tms_shelf as thisTab
- </sql>
-
- <sql id="whereCondition">
- <if test="systemCode != null and systemCode != ''"> and thisTab.system_code = #{systemCode}</if>
- <if test="shelfCode != null and shelfCode != ''"> and thisTab.shelf_code = #{shelfCode}</if>
- <if test="shelfType != null "> and thisTab.shelf_type = #{shelfType}</if>
- <if test="ownerTeamId != null "> and thisTab.owner_team_id = #{ownerTeamId}</if>
- <if test="ownerTeamName != null and ownerTeamName != ''"> and thisTab.owner_team_name like concat('%', #{ownerTeamName}, '%')</if>
- <if test="maxLoadKg != null "> and thisTab.max_load_kg = #{maxLoadKg}</if>
- <if test="compatibleContainerType != null and compatibleContainerType != ''"> and thisTab.compatible_container_type like concat('%', #{compatibleContainerType}, '%')</if>
- <if test="isInUse != null "> and thisTab.is_in_use = #{isInUse}</if>
- <if test="maintenanceStatus != null "> and thisTab.maintenance_status = #{maintenanceStatus}</if>
- <if test="status != null "> and thisTab.status = #{status}</if>
- <if test="selfLeasType != null "> and thisTab.self_leas_type = #{selfLeasType}</if>
- </sql>
-
- <!--鏌ヨ-->
- <select id="selectTmsShelfById" parameterType="Integer" resultMap="TmsShelfResult">
- <include refid="selectTmsShelfVo"/>
- where id = #{id}
- </select>
-
- <select id="selectTmsShelfCount" parameterType="com.ruoyi.tms.domain.TmsShelf" resultType="int">
- <include refid="selectTmsShelfVoCount"/>
- <where>
- <include refid="whereCondition"/>
- </where>
- </select>
-
- <select id="selectTmsShelfList" parameterType="com.ruoyi.tms.domain.TmsShelf" resultMap="TmsShelfResult">
- <include refid="selectTmsShelfVo"/>
- <where>
- <include refid="whereCondition"/>
- </where>
- order by thisTab.id desc
- </select>
-
- <!-- 鏂板 -->
- <insert id="insertTmsShelf" parameterType="com.ruoyi.tms.domain.TmsShelf" useGeneratedKeys="true" keyProperty="id">
- insert into tms_shelf
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="systemCode != null and systemCode != ''">system_code,</if>
- <if test="shelfCode != null and shelfCode != ''">shelf_code,</if>
- <if test="shelfType != null">shelf_type,</if>
- <if test="ownerTeamId != null">owner_team_id,</if>
- <if test="ownerTeamName != null">owner_team_name,</if>
- <if test="manufacturer != null">manufacturer,</if>
- <if test="manufactureDate != null">manufacture_date,</if>
- <if test="lengthMm != null">length_mm,</if>
- <if test="widthMm != null">width_mm,</if>
- <if test="heightMm != null">height_mm,</if>
- <if test="maxLoadKg != null">max_load_kg,</if>
- <if test="compatibleContainerType != null">compatible_container_type,</if>
- <if test="isInUse != null">is_in_use,</if>
- <if test="maintenanceStatus != null">maintenance_status,</if>
- <if test="lastMaintenanceDate != null">last_maintenance_date,</if>
- <if test="nextMaintenanceDate != null">next_maintenance_date,</if>
- <if test="status != null">status,</if>
- <if test="createBy != null">create_by,</if>
- <if test="createTime != null">create_time,</if>
- <if test="updateBy != null">update_by,</if>
- <if test="updateTime != null">update_time,</if>
- <if test="remark != null">remark,</if>
- <if test="selfLeasType != null">self_leas_type,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="systemCode != null and systemCode != ''">#{systemCode},</if>
- <if test="shelfCode != null and shelfCode != ''">#{shelfCode},</if>
- <if test="shelfType != null">#{shelfType},</if>
- <if test="ownerTeamId != null">#{ownerTeamId},</if>
- <if test="ownerTeamName != null">#{ownerTeamName},</if>
- <if test="manufacturer != null">#{manufacturer},</if>
- <if test="manufactureDate != null">#{manufactureDate},</if>
- <if test="lengthMm != null">#{lengthMm},</if>
- <if test="widthMm != null">#{widthMm},</if>
- <if test="heightMm != null">#{heightMm},</if>
- <if test="maxLoadKg != null">#{maxLoadKg},</if>
- <if test="compatibleContainerType != null">#{compatibleContainerType},</if>
- <if test="isInUse != null">#{isInUse},</if>
- <if test="maintenanceStatus != null">#{maintenanceStatus},</if>
- <if test="lastMaintenanceDate != null">#{lastMaintenanceDate},</if>
- <if test="nextMaintenanceDate != null">#{nextMaintenanceDate},</if>
- <if test="status != null">#{status},</if>
- <if test="createBy != null">#{createBy},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="updateBy != null">#{updateBy},</if>
- <if test="updateTime != null">#{updateTime},</if>
- <if test="remark != null">#{remark},</if>
- <if test="selfLeasType != null">#{selfLeasType},</if>
- </trim>
- </insert>
-
- <insert id="insertTmsShelfBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
- insert into tms_shelf
- <trim prefix="(" suffix=") values" suffixOverrides=",">
- id,system_code,shelf_code,shelf_type,owner_team_id,owner_team_name,manufacturer,manufacture_date,length_mm,width_mm,height_mm,max_load_kg,compatible_container_type,is_in_use,maintenance_status,last_maintenance_date,next_maintenance_date,status,create_by,create_time,update_by,update_time,remark,self_leas_type,
- </trim>
- <foreach item="item" index="index" collection="list" separator=",">
- <trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.systemCode},#{item.shelfCode},#{item.shelfType},#{item.ownerTeamId},#{item.ownerTeamName},#{item.manufacturer},#{item.manufactureDate},#{item.lengthMm},#{item.widthMm},#{item.heightMm},#{item.maxLoadKg},#{item.compatibleContainerType},#{item.isInUse},#{item.maintenanceStatus},#{item.lastMaintenanceDate},#{item.nextMaintenanceDate},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.selfLeasType},
- </trim>
- </foreach>
- </insert>
-
- <!-- 淇敼 -->
- <update id="updateTmsShelf" parameterType="com.ruoyi.tms.domain.TmsShelf">
- update tms_shelf
- <trim prefix="SET" suffixOverrides=",">
- <if test="systemCode != null and systemCode != ''">system_code = #{systemCode},</if>
- <if test="shelfCode != null and shelfCode != ''">shelf_code = #{shelfCode},</if>
- <if test="shelfType != null">shelf_type = #{shelfType},</if>
- <if test="ownerTeamId != null">owner_team_id = #{ownerTeamId},</if>
- <if test="ownerTeamName != null">owner_team_name = #{ownerTeamName},</if>
- <if test="manufacturer != null">manufacturer = #{manufacturer},</if>
- <if test="manufactureDate != null">manufacture_date = #{manufactureDate},</if>
- <if test="lengthMm != null">length_mm = #{lengthMm},</if>
- <if test="widthMm != null">width_mm = #{widthMm},</if>
- <if test="heightMm != null">height_mm = #{heightMm},</if>
- <if test="maxLoadKg != null">max_load_kg = #{maxLoadKg},</if>
- <if test="compatibleContainerType != null">compatible_container_type = #{compatibleContainerType},</if>
- <if test="isInUse != null">is_in_use = #{isInUse},</if>
- <if test="maintenanceStatus != null">maintenance_status = #{maintenanceStatus},</if>
- <if test="lastMaintenanceDate != null">last_maintenance_date = #{lastMaintenanceDate},</if>
- <if test="nextMaintenanceDate != null">next_maintenance_date = #{nextMaintenanceDate},</if>
- <if test="status != null">status = #{status},</if>
- <if test="createBy != null">create_by = #{createBy},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
- <if test="updateBy != null">update_by = #{updateBy},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="selfLeasType != null">self_leas_type = #{selfLeasType},</if>
- </trim>
- where id = #{id}
- </update>
- <!-- 淇敼 -->
- <update id="updateTmsShelfBatch" parameterType="java.util.List">
- <foreach collection="list" item="item" index="index" separator=";">
- update tms_shelf
- <trim prefix="SET" suffixOverrides=",">
- <if test="item.systemCode != null and item.systemCode != ''">system_code = #{item.systemCode},</if>
- <if test="item.shelfCode != null and item.shelfCode != ''">shelf_code = #{item.shelfCode},</if>
- <if test="item.shelfType != null">shelf_type = #{item.shelfType},</if>
- <if test="item.ownerTeamId != null">owner_team_id = #{item.ownerTeamId},</if>
- <if test="item.ownerTeamName != null">owner_team_name = #{item.ownerTeamName},</if>
- <if test="item.manufacturer != null">manufacturer = #{item.manufacturer},</if>
- <if test="item.manufactureDate != null">manufacture_date = #{item.manufactureDate},</if>
- <if test="item.lengthMm != null">length_mm = #{item.lengthMm},</if>
- <if test="item.widthMm != null">width_mm = #{item.widthMm},</if>
- <if test="item.heightMm != null">height_mm = #{item.heightMm},</if>
- <if test="item.maxLoadKg != null">max_load_kg = #{item.maxLoadKg},</if>
- <if test="item.compatibleContainerType != null">compatible_container_type = #{item.compatibleContainerType},</if>
- <if test="item.isInUse != null">is_in_use = #{item.isInUse},</if>
- <if test="item.maintenanceStatus != null">maintenance_status = #{item.maintenanceStatus},</if>
- <if test="item.lastMaintenanceDate != null">last_maintenance_date = #{item.lastMaintenanceDate},</if>
- <if test="item.nextMaintenanceDate != null">next_maintenance_date = #{item.nextMaintenanceDate},</if>
- <if test="item.status != null">status = #{item.status},</if>
- <if test="item.createBy != null">create_by = #{item.createBy},</if>
- <if test="item.createTime != null">create_time = #{item.createTime},</if>
- <if test="item.updateBy != null">update_by = #{item.updateBy},</if>
- <if test="item.updateTime != null">update_time = #{item.updateTime},</if>
- <if test="item.remark != null">remark = #{item.remark},</if>
- <if test="item.selfLeasType != null">self_leas_type = #{item.selfLeasType},</if>
- </trim>
- where id = #{item.id}
- </foreach>
- </update>
-
- <!--鍒犻櫎-->
- <delete id="deleteTmsShelfById" parameterType="Integer">
- delete from tms_shelf where id = #{id}
- </delete>
- <delete id="deleteTmsShelfByIds" parameterType="Integer">
- delete from tms_shelf where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/tms/src/main/resources/mapper/tms/TmsVehicleDocumentMapper.xml b/tms/src/main/resources/mapper/tms/TmsVehicleDocumentMapper.xml
deleted file mode 100644
index 1188eae..0000000
--- a/tms/src/main/resources/mapper/tms/TmsVehicleDocumentMapper.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.tms.mapper.TmsVehicleDocumentMapper">
-
- <resultMap type="com.ruoyi.tms.domain.TmsVehicleDocument" id="TmsVehicleDocumentResult">
- <result property="plateNumber" column="plate_number" />
- <result property="id" column="id" />
- <result property="systemCode" column="system_code" />
- <result property="vehicleId" column="vehicle_id" />
- <result property="certificateType" column="certificate_type" />
- <result property="serviceProviderId" column="service_provider_id" />
- <result property="certificateNumber" column="certificate_number" />
- <result property="serviceProviderName" column="service_provider_name" />
- <result property="registerDate" column="register_date" />
- <result property="expireDate" column="expire_date" />
- <result property="certificateFile" column="certificate_file" />
- <result property="lastAnnualCheckDate" column="last_annual_check_date" />
- <result property="invalidDate" column="invalid_date" />
- <result property="status" column="status" />
- <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="selectTmsVehicleDocumentVo">
- select thisTab.plate_number, thisTab.id, thisTab.system_code, thisTab.vehicle_id, thisTab.certificate_type, thisTab.service_provider_id, thisTab.certificate_number, thisTab.service_provider_name, thisTab.register_date, thisTab.expire_date, thisTab.certificate_file, thisTab.last_annual_check_date, thisTab.invalid_date, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark from tms_vehicle_document AS thisTab
- </sql>
- <sql id="selectTmsVehicleDocumentVoCount">
- select count(0) from tms_vehicle_document as thisTab
- </sql>
-
- <sql id="whereCondition">
- <if test="plateNumber != null and plateNumber != ''"> and thisTab.plate_number = #{plateNumber}</if>
- <if test="systemCode != null and systemCode != ''"> and thisTab.system_code = #{systemCode}</if>
- <if test="vehicleId != null "> and thisTab.vehicle_id = #{vehicleId}</if>
- <if test="certificateType != null "> and thisTab.certificate_type = #{certificateType}</if>
- <if test="serviceProviderId != null "> and thisTab.service_provider_id = #{serviceProviderId}</if>
- <if test="certificateNumber != null and certificateNumber != ''"> and thisTab.certificate_number = #{certificateNumber}</if>
- <if test="serviceProviderName != null and serviceProviderName != ''"> and thisTab.service_provider_name like concat('%', #{serviceProviderName}, '%')</if>
- <if test="status != null "> and thisTab.status = #{status}</if>
- </sql>
-
- <!--鏌ヨ-->
- <select id="selectTmsVehicleDocumentById" parameterType="Integer" resultMap="TmsVehicleDocumentResult">
- <include refid="selectTmsVehicleDocumentVo"/>
- where id = #{id}
- </select>
-
- <select id="selectTmsVehicleDocumentCount" parameterType="com.ruoyi.tms.domain.TmsVehicleDocument" resultType="int">
- <include refid="selectTmsVehicleDocumentVoCount"/>
- <where>
- <include refid="whereCondition"/>
- </where>
- </select>
-
- <select id="selectTmsVehicleDocumentList" parameterType="com.ruoyi.tms.domain.TmsVehicleDocument" resultMap="TmsVehicleDocumentResult">
- <include refid="selectTmsVehicleDocumentVo"/>
- <where>
- <include refid="whereCondition"/>
- </where>
- order by thisTab.id desc
- </select>
-
- <!-- 鏂板 -->
- <insert id="insertTmsVehicleDocument" parameterType="com.ruoyi.tms.domain.TmsVehicleDocument" useGeneratedKeys="true" keyProperty="id">
- insert into tms_vehicle_document
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="plateNumber != null and plateNumber != ''">plate_number,</if>
- <if test="systemCode != null and systemCode != ''">system_code,</if>
- <if test="vehicleId != null">vehicle_id,</if>
- <if test="certificateType != null">certificate_type,</if>
- <if test="serviceProviderId != null">service_provider_id,</if>
- <if test="certificateNumber != null and certificateNumber != ''">certificate_number,</if>
- <if test="serviceProviderName != null and serviceProviderName != ''">service_provider_name,</if>
- <if test="registerDate != null">register_date,</if>
- <if test="expireDate != null">expire_date,</if>
- <if test="certificateFile != null">certificate_file,</if>
- <if test="lastAnnualCheckDate != null">last_annual_check_date,</if>
- <if test="invalidDate != null">invalid_date,</if>
- <if test="status != null">status,</if>
- <if test="createBy != null">create_by,</if>
- <if test="createTime != null">create_time,</if>
- <if test="updateBy != null">update_by,</if>
- <if test="updateTime != null">update_time,</if>
- <if test="remark != null">remark,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="plateNumber != null and plateNumber != ''">#{plateNumber},</if>
- <if test="systemCode != null and systemCode != ''">#{systemCode},</if>
- <if test="vehicleId != null">#{vehicleId},</if>
- <if test="certificateType != null">#{certificateType},</if>
- <if test="serviceProviderId != null">#{serviceProviderId},</if>
- <if test="certificateNumber != null and certificateNumber != ''">#{certificateNumber},</if>
- <if test="serviceProviderName != null and serviceProviderName != ''">#{serviceProviderName},</if>
- <if test="registerDate != null">#{registerDate},</if>
- <if test="expireDate != null">#{expireDate},</if>
- <if test="certificateFile != null">#{certificateFile},</if>
- <if test="lastAnnualCheckDate != null">#{lastAnnualCheckDate},</if>
- <if test="invalidDate != null">#{invalidDate},</if>
- <if test="status != null">#{status},</if>
- <if test="createBy != null">#{createBy},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="updateBy != null">#{updateBy},</if>
- <if test="updateTime != null">#{updateTime},</if>
- <if test="remark != null">#{remark},</if>
- </trim>
- </insert>
-
- <insert id="insertTmsVehicleDocumentBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
- insert into tms_vehicle_document
- <trim prefix="(" suffix=") values" suffixOverrides=",">
- plate_number,id,system_code,vehicle_id,certificate_type,service_provider_id,certificate_number,service_provider_name,register_date,expire_date,certificate_file,last_annual_check_date,invalid_date,status,create_by,create_time,update_by,update_time,remark,
- </trim>
- <foreach item="item" index="index" collection="list" separator=",">
- <trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.plateNumber},#{item.id},#{item.systemCode},#{item.vehicleId},#{item.certificateType},#{item.serviceProviderId},#{item.certificateNumber},#{item.serviceProviderName},#{item.registerDate},#{item.expireDate},#{item.certificateFile},#{item.lastAnnualCheckDate},#{item.invalidDate},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},
- </trim>
- </foreach>
- </insert>
-
- <!-- 淇敼 -->
- <update id="updateTmsVehicleDocument" parameterType="com.ruoyi.tms.domain.TmsVehicleDocument">
- update tms_vehicle_document
- <trim prefix="SET" suffixOverrides=",">
- <if test="plateNumber != null and plateNumber != ''">plate_number = #{plateNumber},</if>
- <if test="systemCode != null and systemCode != ''">system_code = #{systemCode},</if>
- <if test="vehicleId != null">vehicle_id = #{vehicleId},</if>
- <if test="certificateType != null">certificate_type = #{certificateType},</if>
- <if test="serviceProviderId != null">service_provider_id = #{serviceProviderId},</if>
- <if test="certificateNumber != null and certificateNumber != ''">certificate_number = #{certificateNumber},</if>
- <if test="serviceProviderName != null and serviceProviderName != ''">service_provider_name = #{serviceProviderName},</if>
- <if test="registerDate != null">register_date = #{registerDate},</if>
- <if test="expireDate != null">expire_date = #{expireDate},</if>
- <if test="certificateFile != null">certificate_file = #{certificateFile},</if>
- <if test="lastAnnualCheckDate != null">last_annual_check_date = #{lastAnnualCheckDate},</if>
- <if test="invalidDate != null">invalid_date = #{invalidDate},</if>
- <if test="status != null">status = #{status},</if>
- <if test="createBy != null">create_by = #{createBy},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
- <if test="updateBy != null">update_by = #{updateBy},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="remark != null">remark = #{remark},</if>
- </trim>
- where id = #{id}
- </update>
- <!-- 淇敼 -->
- <update id="updateTmsVehicleDocumentBatch" parameterType="java.util.List">
- <foreach collection="list" item="item" index="index" separator=";">
- update tms_vehicle_document
- <trim prefix="SET" suffixOverrides=",">
- <if test="item.plateNumber != null and item.plateNumber != ''">plate_number = #{item.plateNumber},</if>
- <if test="item.systemCode != null and item.systemCode != ''">system_code = #{item.systemCode},</if>
- <if test="item.vehicleId != null">vehicle_id = #{item.vehicleId},</if>
- <if test="item.certificateType != null">certificate_type = #{item.certificateType},</if>
- <if test="item.serviceProviderId != null">service_provider_id = #{item.serviceProviderId},</if>
- <if test="item.certificateNumber != null and item.certificateNumber != ''">certificate_number = #{item.certificateNumber},</if>
- <if test="item.serviceProviderName != null and item.serviceProviderName != ''">service_provider_name = #{item.serviceProviderName},</if>
- <if test="item.registerDate != null">register_date = #{item.registerDate},</if>
- <if test="item.expireDate != null">expire_date = #{item.expireDate},</if>
- <if test="item.certificateFile != null">certificate_file = #{item.certificateFile},</if>
- <if test="item.lastAnnualCheckDate != null">last_annual_check_date = #{item.lastAnnualCheckDate},</if>
- <if test="item.invalidDate != null">invalid_date = #{item.invalidDate},</if>
- <if test="item.status != null">status = #{item.status},</if>
- <if test="item.createBy != null">create_by = #{item.createBy},</if>
- <if test="item.createTime != null">create_time = #{item.createTime},</if>
- <if test="item.updateBy != null">update_by = #{item.updateBy},</if>
- <if test="item.updateTime != null">update_time = #{item.updateTime},</if>
- <if test="item.remark != null">remark = #{item.remark},</if>
- </trim>
- where id = #{item.id}
- </foreach>
- </update>
-
- <!--鍒犻櫎-->
- <delete id="deleteTmsVehicleDocumentById" parameterType="Integer">
- delete from tms_vehicle_document where id = #{id}
- </delete>
- <delete id="deleteTmsVehicleDocumentByIds" parameterType="Integer">
- delete from tms_vehicle_document where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/tms/src/main/resources/mapper/tms/TmsVehicleMapper.xml b/tms/src/main/resources/mapper/tms/TmsVehicleMapper.xml
deleted file mode 100644
index 0343dc5..0000000
--- a/tms/src/main/resources/mapper/tms/TmsVehicleMapper.xml
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.tms.mapper.TmsVehicleMapper">
-
- <resultMap type="com.ruoyi.tms.domain.TmsVehicle" id="TmsVehicleResult">
- <result property="id" column="id" />
- <result property="systemCode" column="system_code" />
- <result property="serviceProviderId" column="service_provider_id" />
- <result property="vehicleType" column="vehicle_type" />
- <result property="serviceProviderName" column="service_provider_name" />
- <result property="internalCode" column="internal_code" />
- <result property="licensePlate" column="license_plate" />
- <result property="licenseHk" column="license_hk" />
- <result property="licenseMo" column="license_mo" />
- <result property="licenseColor" column="license_color" />
- <result property="owner" column="owner" />
- <result property="isBlacklist" column="is_blacklist" />
- <result property="isCustomsControl" column="is_customs_control" />
- <result property="isTrailer" column="is_trailer" />
- <result property="mainDriver" column="main_driver" />
- <result property="mainDriverPhone" column="main_driver_phone" />
- <result property="assistantDriver" column="assistant_driver" />
- <result property="assistantDriverPhone" column="assistant_driver_phone" />
- <result property="hasTask" column="has_task" />
- <result property="vehicleUsageStatus" column="vehicle_usage_status" />
- <result property="bodyColor" column="body_color" />
- <result property="frameNumber" column="frame_number" />
- <result property="engineNumber" column="engine_number" />
- <result property="energyType" column="energy_type" />
- <result property="emptyLoadFuel" column="empty_load_fuel" />
- <result property="fullLoadFuel" column="full_load_fuel" />
- <result property="purchaseDate" column="purchase_date" />
- <result property="purchasePrice" column="purchase_price" />
- <result property="mandatoryScrapDate" column="mandatory_scrap_date" />
- <result property="lastAnnualInspection" column="last_annual_inspection" />
- <result property="commercialInsuranceExpiry" column="commercial_insurance_expiry" />
- <result property="trafficInsuranceExpiry" column="traffic_insurance_expiry" />
- <result property="actualLength" column="actual_length" />
- <result property="actualWidth" column="actual_width" />
- <result property="actualHeight" column="actual_height" />
- <result property="loadVolume" column="load_volume" />
- <result property="loadWeight" column="load_weight" />
- <result property="emissionStandard" column="emission_standard" />
- <result property="enginePower" column="engine_power" />
- <result property="status" column="status" />
- <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="carrierType" column="carrier_type" />
- <result property="settlementId" column="settlement_id" />
- <result property="settlementName" column="settlement_name" />
- <result property="carKeyNo" column="car_key_no" />
- </resultMap>
-
- <sql id="selectTmsVehicleVo">
- select thisTab.id, thisTab.system_code, thisTab.service_provider_id, thisTab.vehicle_type, thisTab.service_provider_name, thisTab.internal_code, thisTab.license_plate, thisTab.license_hk, thisTab.license_mo, thisTab.license_color, thisTab.owner, thisTab.is_blacklist, thisTab.is_customs_control, thisTab.is_trailer, thisTab.main_driver, thisTab.main_driver_phone, thisTab.assistant_driver, thisTab.assistant_driver_phone, thisTab.has_task, thisTab.vehicle_usage_status, thisTab.body_color, thisTab.frame_number, thisTab.engine_number, thisTab.energy_type, thisTab.empty_load_fuel, thisTab.full_load_fuel, thisTab.purchase_date, thisTab.purchase_price, thisTab.mandatory_scrap_date, thisTab.last_annual_inspection, thisTab.commercial_insurance_expiry, thisTab.traffic_insurance_expiry, thisTab.actual_length, thisTab.actual_width, thisTab.actual_height, thisTab.load_volume, thisTab.load_weight, thisTab.emission_standard, thisTab.engine_power, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark,thisTab.carrier_type, thisTab.settlement_id, thisTab.settlement_name, thisTab.car_key_no from tms_vehicle AS thisTab
- </sql>
- <sql id="selectTmsVehicleVoCount">
- select count(0) from tms_vehicle as thisTab
- </sql>
-
- <sql id="whereCondition">
- <if test="systemCode != null and systemCode != ''"> and thisTab.system_code = #{systemCode}</if>
- <if test="serviceProviderId != null "> and thisTab.service_provider_id = #{serviceProviderId}</if>
- <if test="vehicleType != null and vehicleType != ''"> and thisTab.vehicle_type = #{vehicleType}</if>
- <if test="serviceProviderName != null and serviceProviderName != ''"> and thisTab.service_provider_name like concat('%', #{serviceProviderName}, '%')</if>
- <if test="licensePlate != null and licensePlate != ''"> and thisTab.license_plate = #{licensePlate}</if>
- <if test="hasTask != null "> and thisTab.has_task = #{hasTask}</if>
- <if test="vehicleUsageStatus != null "> and thisTab.vehicle_usage_status = #{vehicleUsageStatus}</if>
- <if test="status != null "> and thisTab.status = #{status}</if>
- <if test="carrierType != null "> and thisTab.carrier_type = #{carrierType}</if>
- <if test="settlementId != null "> and thisTab.settlement_id = #{settlementId}</if>
- <if test="settlementName != null and settlementName != ''"> and thisTab.settlement_name like concat('%', #{settlementName}, '%')</if>
- <if test="carKeyNo != null "> and thisTab.car_key_no = #{carKeyNo}</if>
- </sql>
-
- <!--鏌ヨ-->
- <select id="selectTmsVehicleById" parameterType="Integer" resultMap="TmsVehicleResult">
- <include refid="selectTmsVehicleVo"/>
- where id = #{id}
- </select>
-
- <select id="selectTmsVehicleCount" parameterType="com.ruoyi.tms.domain.TmsVehicle" resultType="int">
- <include refid="selectTmsVehicleVoCount"/>
- <where>
- <include refid="whereCondition"/>
- </where>
- </select>
-
- <select id="selectTmsVehicleList" parameterType="com.ruoyi.tms.domain.TmsVehicle" resultMap="TmsVehicleResult">
- <include refid="selectTmsVehicleVo"/>
- <where>
- <include refid="whereCondition"/>
- </where>
- order by thisTab.id desc
- </select>
-
- <!-- 鏂板 -->
- <insert id="insertTmsVehicle" parameterType="com.ruoyi.tms.domain.TmsVehicle" useGeneratedKeys="true" keyProperty="id">
- insert into tms_vehicle
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="systemCode != null and systemCode != ''">system_code,</if>
- <if test="serviceProviderId != null">service_provider_id,</if>
- <if test="vehicleType != null and vehicleType != ''">vehicle_type,</if>
- <if test="serviceProviderName != null">service_provider_name,</if>
- <if test="internalCode != null">internal_code,</if>
- <if test="licensePlate != null and licensePlate != ''">license_plate,</if>
- <if test="licenseHk != null">license_hk,</if>
- <if test="licenseMo != null">license_mo,</if>
- <if test="licenseColor != null">license_color,</if>
- <if test="owner != null">owner,</if>
- <if test="isBlacklist != null">is_blacklist,</if>
- <if test="isCustomsControl != null">is_customs_control,</if>
- <if test="isTrailer != null">is_trailer,</if>
- <if test="mainDriver != null and mainDriver != ''">main_driver,</if>
- <if test="mainDriverPhone != null">main_driver_phone,</if>
- <if test="assistantDriver != null">assistant_driver,</if>
- <if test="assistantDriverPhone != null">assistant_driver_phone,</if>
- <if test="hasTask != null">has_task,</if>
- <if test="vehicleUsageStatus != null">vehicle_usage_status,</if>
- <if test="bodyColor != null">body_color,</if>
- <if test="frameNumber != null">frame_number,</if>
- <if test="engineNumber != null">engine_number,</if>
- <if test="energyType != null">energy_type,</if>
- <if test="emptyLoadFuel != null">empty_load_fuel,</if>
- <if test="fullLoadFuel != null">full_load_fuel,</if>
- <if test="purchaseDate != null">purchase_date,</if>
- <if test="purchasePrice != null">purchase_price,</if>
- <if test="mandatoryScrapDate != null">mandatory_scrap_date,</if>
- <if test="lastAnnualInspection != null">last_annual_inspection,</if>
- <if test="commercialInsuranceExpiry != null">commercial_insurance_expiry,</if>
- <if test="trafficInsuranceExpiry != null">traffic_insurance_expiry,</if>
- <if test="actualLength != null">actual_length,</if>
- <if test="actualWidth != null">actual_width,</if>
- <if test="actualHeight != null">actual_height,</if>
- <if test="loadVolume != null">load_volume,</if>
- <if test="loadWeight != null">load_weight,</if>
- <if test="emissionStandard != null">emission_standard,</if>
- <if test="enginePower != null">engine_power,</if>
- <if test="status != null">status,</if>
- <if test="createBy != null">create_by,</if>
- <if test="createTime != null">create_time,</if>
- <if test="updateBy != null">update_by,</if>
- <if test="updateTime != null">update_time,</if>
- <if test="remark != null">remark,</if>
- <if test="carrierType != null">carrier_type,</if>
- <if test="settlementId != null">settlement_id,</if>
- <if test="settlementName != null">settlement_name,</if>
- <if test="carKeyNo != null">car_key_no,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="systemCode != null and systemCode != ''">#{systemCode},</if>
- <if test="serviceProviderId != null">#{serviceProviderId},</if>
- <if test="vehicleType != null and vehicleType != ''">#{vehicleType},</if>
- <if test="serviceProviderName != null">#{serviceProviderName},</if>
- <if test="internalCode != null">#{internalCode},</if>
- <if test="licensePlate != null and licensePlate != ''">#{licensePlate},</if>
- <if test="licenseHk != null">#{licenseHk},</if>
- <if test="licenseMo != null">#{licenseMo},</if>
- <if test="licenseColor != null">#{licenseColor},</if>
- <if test="owner != null">#{owner},</if>
- <if test="isBlacklist != null">#{isBlacklist},</if>
- <if test="isCustomsControl != null">#{isCustomsControl},</if>
- <if test="isTrailer != null">#{isTrailer},</if>
- <if test="mainDriver != null and mainDriver != ''">#{mainDriver},</if>
- <if test="mainDriverPhone != null">#{mainDriverPhone},</if>
- <if test="assistantDriver != null">#{assistantDriver},</if>
- <if test="assistantDriverPhone != null">#{assistantDriverPhone},</if>
- <if test="hasTask != null">#{hasTask},</if>
- <if test="vehicleUsageStatus != null">#{vehicleUsageStatus},</if>
- <if test="bodyColor != null">#{bodyColor},</if>
- <if test="frameNumber != null">#{frameNumber},</if>
- <if test="engineNumber != null">#{engineNumber},</if>
- <if test="energyType != null">#{energyType},</if>
- <if test="emptyLoadFuel != null">#{emptyLoadFuel},</if>
- <if test="fullLoadFuel != null">#{fullLoadFuel},</if>
- <if test="purchaseDate != null">#{purchaseDate},</if>
- <if test="purchasePrice != null">#{purchasePrice},</if>
- <if test="mandatoryScrapDate != null">#{mandatoryScrapDate},</if>
- <if test="lastAnnualInspection != null">#{lastAnnualInspection},</if>
- <if test="commercialInsuranceExpiry != null">#{commercialInsuranceExpiry},</if>
- <if test="trafficInsuranceExpiry != null">#{trafficInsuranceExpiry},</if>
- <if test="actualLength != null">#{actualLength},</if>
- <if test="actualWidth != null">#{actualWidth},</if>
- <if test="actualHeight != null">#{actualHeight},</if>
- <if test="loadVolume != null">#{loadVolume},</if>
- <if test="loadWeight != null">#{loadWeight},</if>
- <if test="emissionStandard != null">#{emissionStandard},</if>
- <if test="enginePower != null">#{enginePower},</if>
- <if test="status != null">#{status},</if>
- <if test="createBy != null">#{createBy},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="updateBy != null">#{updateBy},</if>
- <if test="updateTime != null">#{updateTime},</if>
- <if test="remark != null">#{remark},</if>
- <if test="carrierType != null">#{carrierType},</if>
- <if test="settlementId != null">#{settlementId},</if>
- <if test="settlementName != null">#{settlementName},</if>
- <if test="carKeyNo != null">#{carKeyNo},</if>
- </trim>
- </insert>
-
- <insert id="insertTmsVehicleBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
- insert into tms_vehicle
- <trim prefix="(" suffix=") values" suffixOverrides=",">
- id,system_code,service_provider_id,vehicle_type,service_provider_name,internal_code,license_plate,license_hk,license_mo,license_color,owner,is_blacklist,is_customs_control,is_trailer,main_driver,main_driver_phone,assistant_driver,assistant_driver_phone,has_task,vehicle_usage_status,body_color,frame_number,engine_number,energy_type,empty_load_fuel,full_load_fuel,purchase_date,purchase_price,mandatory_scrap_date,last_annual_inspection,commercial_insurance_expiry,traffic_insurance_expiry,actual_length,actual_width,actual_height,load_volume,load_weight,emission_standard,engine_power,status,create_by,create_time,update_by,update_time,remark,carrier_type,settlement_id,settlement_name,car_key_no,
- </trim>
- <foreach item="item" index="index" collection="list" separator=",">
- <trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.systemCode},#{item.serviceProviderId},#{item.vehicleType},#{item.serviceProviderName},#{item.internalCode},#{item.licensePlate},#{item.licenseHk},#{item.licenseMo},#{item.licenseColor},#{item.owner},#{item.isBlacklist},#{item.isCustomsControl},#{item.isTrailer},#{item.mainDriver},#{item.mainDriverPhone},#{item.assistantDriver},#{item.assistantDriverPhone},#{item.hasTask},#{item.vehicleUsageStatus},#{item.bodyColor},#{item.frameNumber},#{item.engineNumber},#{item.energyType},#{item.emptyLoadFuel},#{item.fullLoadFuel},#{item.purchaseDate},#{item.purchasePrice},#{item.mandatoryScrapDate},#{item.lastAnnualInspection},#{item.commercialInsuranceExpiry},#{item.trafficInsuranceExpiry},#{item.actualLength},#{item.actualWidth},#{item.actualHeight},#{item.loadVolume},#{item.loadWeight},#{item.emissionStandard},#{item.enginePower},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.carrierType},#{item.settlementId},#{item.settlementName},#{item.carKeyNo},
- </trim>
- </foreach>
- </insert>
-
- <!-- 淇敼 -->
- <update id="updateTmsVehicle" parameterType="com.ruoyi.tms.domain.TmsVehicle">
- update tms_vehicle
- <trim prefix="SET" suffixOverrides=",">
- <if test="systemCode != null and systemCode != ''">system_code = #{systemCode},</if>
- <if test="serviceProviderId != null">service_provider_id = #{serviceProviderId},</if>
- <if test="vehicleType != null and vehicleType != ''">vehicle_type = #{vehicleType},</if>
- <if test="serviceProviderName != null">service_provider_name = #{serviceProviderName},</if>
- <if test="internalCode != null">internal_code = #{internalCode},</if>
- <if test="licensePlate != null and licensePlate != ''">license_plate = #{licensePlate},</if>
- <if test="licenseHk != null">license_hk = #{licenseHk},</if>
- <if test="licenseMo != null">license_mo = #{licenseMo},</if>
- <if test="licenseColor != null">license_color = #{licenseColor},</if>
- <if test="owner != null">owner = #{owner},</if>
- <if test="isBlacklist != null">is_blacklist = #{isBlacklist},</if>
- <if test="isCustomsControl != null">is_customs_control = #{isCustomsControl},</if>
- <if test="isTrailer != null">is_trailer = #{isTrailer},</if>
- <if test="mainDriver != null and mainDriver != ''">main_driver = #{mainDriver},</if>
- <if test="mainDriverPhone != null">main_driver_phone = #{mainDriverPhone},</if>
- <if test="assistantDriver != null">assistant_driver = #{assistantDriver},</if>
- <if test="assistantDriverPhone != null">assistant_driver_phone = #{assistantDriverPhone},</if>
- <if test="hasTask != null">has_task = #{hasTask},</if>
- <if test="vehicleUsageStatus != null">vehicle_usage_status = #{vehicleUsageStatus},</if>
- <if test="bodyColor != null">body_color = #{bodyColor},</if>
- <if test="frameNumber != null">frame_number = #{frameNumber},</if>
- <if test="engineNumber != null">engine_number = #{engineNumber},</if>
- <if test="energyType != null">energy_type = #{energyType},</if>
- <if test="emptyLoadFuel != null">empty_load_fuel = #{emptyLoadFuel},</if>
- <if test="fullLoadFuel != null">full_load_fuel = #{fullLoadFuel},</if>
- <if test="purchaseDate != null">purchase_date = #{purchaseDate},</if>
- <if test="purchasePrice != null">purchase_price = #{purchasePrice},</if>
- <if test="mandatoryScrapDate != null">mandatory_scrap_date = #{mandatoryScrapDate},</if>
- <if test="lastAnnualInspection != null">last_annual_inspection = #{lastAnnualInspection},</if>
- <if test="commercialInsuranceExpiry != null">commercial_insurance_expiry = #{commercialInsuranceExpiry},</if>
- <if test="trafficInsuranceExpiry != null">traffic_insurance_expiry = #{trafficInsuranceExpiry},</if>
- <if test="actualLength != null">actual_length = #{actualLength},</if>
- <if test="actualWidth != null">actual_width = #{actualWidth},</if>
- <if test="actualHeight != null">actual_height = #{actualHeight},</if>
- <if test="loadVolume != null">load_volume = #{loadVolume},</if>
- <if test="loadWeight != null">load_weight = #{loadWeight},</if>
- <if test="emissionStandard != null">emission_standard = #{emissionStandard},</if>
- <if test="enginePower != null">engine_power = #{enginePower},</if>
- <if test="status != null">status = #{status},</if>
- <if test="createBy != null">create_by = #{createBy},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
- <if test="updateBy != null">update_by = #{updateBy},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="carrierType != null">carrier_type = #{carrierType},</if>
- <if test="settlementId != null">settlement_id = #{settlementId},</if>
- <if test="settlementName != null">settlement_name = #{settlementName},</if>
- <if test="carKeyNo != null">car_key_no = #{carKeyNo},</if>
- </trim>
- where id = #{id}
- </update>
- <!-- 淇敼 -->
- <update id="updateTmsVehicleBatch" parameterType="java.util.List">
- <foreach collection="list" item="item" index="index" separator=";">
- update tms_vehicle
- <trim prefix="SET" suffixOverrides=",">
- <if test="item.systemCode != null and item.systemCode != ''">system_code = #{item.systemCode},</if>
- <if test="item.serviceProviderId != null">service_provider_id = #{item.serviceProviderId},</if>
- <if test="item.vehicleType != null and item.vehicleType != ''">vehicle_type = #{item.vehicleType},</if>
- <if test="item.serviceProviderName != null">service_provider_name = #{item.serviceProviderName},</if>
- <if test="item.internalCode != null">internal_code = #{item.internalCode},</if>
- <if test="item.licensePlate != null and item.licensePlate != ''">license_plate = #{item.licensePlate},</if>
- <if test="item.licenseHk != null">license_hk = #{item.licenseHk},</if>
- <if test="item.licenseMo != null">license_mo = #{item.licenseMo},</if>
- <if test="item.licenseColor != null">license_color = #{item.licenseColor},</if>
- <if test="item.owner != null">owner = #{item.owner},</if>
- <if test="item.isBlacklist != null">is_blacklist = #{item.isBlacklist},</if>
- <if test="item.isCustomsControl != null">is_customs_control = #{item.isCustomsControl},</if>
- <if test="item.isTrailer != null">is_trailer = #{item.isTrailer},</if>
- <if test="item.mainDriver != null and item.mainDriver != ''">main_driver = #{item.mainDriver},</if>
- <if test="item.mainDriverPhone != null">main_driver_phone = #{item.mainDriverPhone},</if>
- <if test="item.assistantDriver != null">assistant_driver = #{item.assistantDriver},</if>
- <if test="item.assistantDriverPhone != null">assistant_driver_phone = #{item.assistantDriverPhone},</if>
- <if test="item.hasTask != null">has_task = #{item.hasTask},</if>
- <if test="item.vehicleUsageStatus != null">vehicle_usage_status = #{item.vehicleUsageStatus},</if>
- <if test="item.bodyColor != null">body_color = #{item.bodyColor},</if>
- <if test="item.frameNumber != null">frame_number = #{item.frameNumber},</if>
- <if test="item.engineNumber != null">engine_number = #{item.engineNumber},</if>
- <if test="item.energyType != null">energy_type = #{item.energyType},</if>
- <if test="item.emptyLoadFuel != null">empty_load_fuel = #{item.emptyLoadFuel},</if>
- <if test="item.fullLoadFuel != null">full_load_fuel = #{item.fullLoadFuel},</if>
- <if test="item.purchaseDate != null">purchase_date = #{item.purchaseDate},</if>
- <if test="item.purchasePrice != null">purchase_price = #{item.purchasePrice},</if>
- <if test="item.mandatoryScrapDate != null">mandatory_scrap_date = #{item.mandatoryScrapDate},</if>
- <if test="item.lastAnnualInspection != null">last_annual_inspection = #{item.lastAnnualInspection},</if>
- <if test="item.commercialInsuranceExpiry != null">commercial_insurance_expiry = #{item.commercialInsuranceExpiry},</if>
- <if test="item.trafficInsuranceExpiry != null">traffic_insurance_expiry = #{item.trafficInsuranceExpiry},</if>
- <if test="item.actualLength != null">actual_length = #{item.actualLength},</if>
- <if test="item.actualWidth != null">actual_width = #{item.actualWidth},</if>
- <if test="item.actualHeight != null">actual_height = #{item.actualHeight},</if>
- <if test="item.loadVolume != null">load_volume = #{item.loadVolume},</if>
- <if test="item.loadWeight != null">load_weight = #{item.loadWeight},</if>
- <if test="item.emissionStandard != null">emission_standard = #{item.emissionStandard},</if>
- <if test="item.enginePower != null">engine_power = #{item.enginePower},</if>
- <if test="item.status != null">status = #{item.status},</if>
- <if test="item.createBy != null">create_by = #{item.createBy},</if>
- <if test="item.createTime != null">create_time = #{item.createTime},</if>
- <if test="item.updateBy != null">update_by = #{item.updateBy},</if>
- <if test="item.updateTime != null">update_time = #{item.updateTime},</if>
- <if test="item.remark != null">remark = #{item.remark},</if>
- <if test="item.carrierType != null">carrier_type = #{item.carrierType},</if>
- <if test="item.settlementId != null">settlement_id = #{item.settlementId},</if>
- <if test="item.settlementName != null">settlement_name = #{item.settlementName},</if>
- <if test="item.carKeyNo != null">car_key_no = #{item.carKeyNo},</if>
- </trim>
- where id = #{item.id}
- </foreach>
- </update>
-
- <!--鍒犻櫎-->
- <delete id="deleteTmsVehicleById" parameterType="Integer">
- delete from tms_vehicle where id = #{id}
- </delete>
- <delete id="deleteTmsVehicleByIds" parameterType="Integer">
- delete from tms_vehicle where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
--
Gitblit v1.8.0