From 89fd2cf7202c321512c2ea699a3a220a7138ed44 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

---
 ui/admin-ui3/src/api/tms/tmsDispatchOrder.ts |  164 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 150 insertions(+), 14 deletions(-)

diff --git a/ui/admin-ui3/src/api/tms/tmsDispatchOrder.ts b/ui/admin-ui3/src/api/tms/tmsDispatchOrder.ts
index 90d237e..6ccfb59 100644
--- a/ui/admin-ui3/src/api/tms/tmsDispatchOrder.ts
+++ b/ui/admin-ui3/src/api/tms/tmsDispatchOrder.ts
@@ -1,33 +1,126 @@
-import request,{download,requestType} from "@/utils/request";
+import request, {download, requestType} from "@/utils/request";
 import {BaseEntityInterface} from "@/utils/globalInterface";
-export interface TmsDispatchOrderI extends BaseEntityInterface{
-            id ?:  number   ,            dispatchNo ?:  string   ,            customerName ?:  string   ,            customerCode ?:  string   ,            projectName ?:  string   ,            transportPlanNo ?:  string   ,            departureRegion ?:  string   ,            destinationRegion ?:  string   ,            transportLine ?:  number   ,            vehicleProvider ?:  number   ,            mainDriver ?:  number   ,            assistantDriver ?:  string   ,            requiredVehicleType ?:  number   ,            vehicleNumber ?:  string   ,            transportMode ?:  number   ,            loadMode ?:  number   ,            goodsName ?:  string   ,            quantity ?:  string   ,            goodsType ?:  string   ,            weight ?:  string   ,            netWeight ?:  string   ,            volume ?:  string   ,            loosePieces ?:  number   ,            fullContainers ?:  number   ,            containerNo ?:  string   ,            palletCount ?:  number   ,            earliestDeparture ?:  string   ,            latestDeparture ?:  string   ,            earliestArrival ?:  string   ,            latestArrival ?:  string   ,            departureAddress ?:  string   ,            destinationAddress ?:  string   ,            actualVehicleType ?:  string   ,            actualLoadStart ?:  string   ,            actualUnloadEnd ?:  string   ,            actualDeparture ?:  string   ,            actualArrival ?:  string   ,            actualQuantity ?:  string   ,            actualWeight ?:  string   ,            actualVolume ?:  string   ,            reweighWeight ?:  string   ,            electronicLock ?:  string   ,            containerInfo ?:  string   ,            carPlate ?:  string   ,            emptyMileage ?:  string   ,            emptyFuel ?:  string   ,            loadedMileage ?:  string   ,            loadedFuel ?:  string   ,            shiftNo ?:  string   ,            lineNo ?:  string   ,            status ?:  number   ,            createBy ?:  string   ,            createTime ?:  string   ,            updateBy ?:  string   ,            updateTime ?:  string   ,            remark ?:  string       }
+
+export interface TmsDispatchOrderI extends BaseEntityInterface {
+    id?: number,
+    dispatchNo?: string,
+    customerId?: number,
+    customerCode?: string,
+    projectId?: number,
+    projectName?: string,
+    contractId?: number,
+    contractName?: string,
+    orderType?: number,
+    transportLine?: string,
+    signType?: number,
+    vehicleProviderId?: number,
+    vehicleProviderName?: string,
+    loadingServiceProviderId?: number,
+    loadingServiceProviderName?: string,
+    customsServiceProviderId?: number,
+    customsServiceProviderName?: string,
+    isUrgent?: number,
+    transportType?: number,
+    loadMethod?: number,
+    mainDriverId?: number,
+    mainDriverName?: string,
+    assistantDriverId?: number,
+    requiredVehicleTypes?: string,
+    assistantDriverName?: string,
+    containerNo?: string,
+    vehicleId?: number,
+    licensePlate?: string,
+    earliestDeparture?: string,
+    shipperId?: number,
+    latestDeparture?: string,
+    shipperName?: string,
+    shipperMobile?: string,
+    earliestArrival?: string,
+    shipperAddress?: string,
+    latestArrival?: string,
+    departureAddress?: string,
+    shipperRegionCode?: string,
+    destinationAddress?: string,
+    receiverId?: number,
+    actualVehicleType?: string,
+    receiverName?: string,
+    actualLoadStart?: string,
+    receiverMobile?: string,
+    actualUnloadEnd?: string,
+    receiverAddress?: string,
+    actualDeparture?: string,
+    receiverRegionCode?: string,
+    actualArrival?: string,
+    actualQuantity?: string,
+    actualWeight?: string,
+    actualVolume?: string,
+    reweighWeight?: string,
+    containerId?: number,
+    electronicLock?: string,
+    shelfId?: number,
+    emptyMileage?: string,
+    emptyFuel?: string,
+    shelfCode?: string,
+    loadedMileage?: string,
+    loadedFuel?: string,
+    shiftNo?: string,
+    lineNo?: string,
+    status?: number,
+    createBy?: string,
+    createTime?: string,
+    updateBy?: string,
+    updateTime?: string,
+    remark?: string,
+    accountsReceivableStatus?: number,
+    accountsPayableStatus?: number,
+    shipperRegionLabel:string,
+    receiverRegionLabel:string,
+    [key: string]: any,
+}
 
 
 /**
  * 鏌ヨ璋冨害鍗曠鐞嗗垪琛�
  */
-export const listTmsDispatchOrder:requestType = (query) => {
+export const listTmsDispatchOrder: requestType = (query) => {
     return request({
         url: '/tms/tmsDispatchOrder/list',
-        method:'get',
-        params:query
+        method: 'get',
+        params: query
     })
 }
 /**
  * 鏌ヨ璋冨害鍗曠鐞嗚缁�
  */
-export const getTmsDispatchOrder:requestType = (id) => {
+export const getTmsDispatchOrder: requestType = (id) => {
     return request({
         url: '/tms/tmsDispatchOrder/' + id,
-        method:'get'
+        method: 'get'
+    })
+}
+export const confirmOrder: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/confirmOrder/' + id,
+        method: 'get'
+    })
+}
+export const copyOrder: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/copyOrder/' + id,
+        method: 'get'
+    })
+}
+export const okOrder: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/okOrder/' + id,
+        method: 'get'
     })
 }
 
 /**
  * 鏂板璋冨害鍗曠鐞�
  */
-export const addTmsDispatchOrder:requestType = (data) => {
+export const addTmsDispatchOrder: requestType = (data) => {
     return request({
         url: '/tms/tmsDispatchOrder',
         method: 'post',
@@ -35,10 +128,18 @@
     })
 }
 
+export const generateTmsDispatchOrder: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/generateTmsDispatchOrder/'+id,
+        method: 'get',
+    })
+}
+
+
 /**
  * 淇敼璋冨害鍗曠鐞�
  */
-export const updateTmsDispatchOrder:requestType = (data) => {
+export const updateTmsDispatchOrder: requestType = (data) => {
     return request({
         url: '/tms/tmsDispatchOrder',
         method: 'put',
@@ -49,10 +150,45 @@
 /**
  * 鍒犻櫎璋冨害鍗曠鐞�
  */
-export const delTmsDispatchOrder:requestType = (id) => {
+export const delTmsDispatchOrder: requestType = (id) => {
     return request({
         url: '/tms/tmsDispatchOrder/' + id,
         method: 'delete'
+    })
+}
+
+export const initGenerate: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/initGenerate/' + id,
+        method: 'get'
+    })
+}
+export const dropHook: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/dropHook/' + id,
+        method: 'get'
+    })
+}
+export const connectHang: requestType = (data) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/connectHang',
+        method: 'post',
+        data
+    })
+}
+
+export const customsOrder: requestType = (data) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/customsOrder',
+        method: 'post',
+        data
+    })
+}
+export const loadingOrder: requestType = (data) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/loadingOrder',
+        method: 'post',
+        data
     })
 }
 
@@ -60,8 +196,8 @@
 /**
  * 瀵煎嚭璋冨害鍗曠鐞�
  */
-export const exportTmsDispatchOrder:requestType = (query) => {
-    return new Promise<any>(()=>{
-        download('/tms/tmsDispatchOrder/export',query);
+export const exportTmsDispatchOrder: requestType = (query) => {
+    return new Promise<any>(() => {
+        download('/tms/tmsDispatchOrder/export', query);
     })
 }

--
Gitblit v1.8.0