From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 ui/admin-ui3/src/api/tms/tmsDispatchOrder.ts |   92 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/ui/admin-ui3/src/api/tms/tmsDispatchOrder.ts b/ui/admin-ui3/src/api/tms/tmsDispatchOrder.ts
index 6ccfb59..e8df9f9 100644
--- a/ui/admin-ui3/src/api/tms/tmsDispatchOrder.ts
+++ b/ui/admin-ui3/src/api/tms/tmsDispatchOrder.ts
@@ -73,8 +73,8 @@
     remark?: string,
     accountsReceivableStatus?: number,
     accountsPayableStatus?: number,
-    shipperRegionLabel:string,
-    receiverRegionLabel:string,
+    shipperRegionLabel?:string,
+    receiverRegionLabel?:string,
     [key: string]: any,
 }
 
@@ -85,6 +85,14 @@
 export const listTmsDispatchOrder: requestType = (query) => {
     return request({
         url: '/tms/tmsDispatchOrder/list',
+        method: 'get',
+        params: query
+    })
+}
+
+export const costListTmsDispatchOrder: requestType = (query) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/costList',
         method: 'get',
         params: query
     })
@@ -134,6 +142,26 @@
         method: 'get',
     })
 }
+export const ysGenerateTmsDispatchOrder: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/ysGenerateTmsDispatchOrder/'+id,
+        method: 'get',
+    })
+}
+export const yfGenerateTmsDispatchOrder: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/yfGenerateTmsDispatchOrder/'+id,
+        method: 'get',
+    })
+}
+
+export const getServiceProvider: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/getServiceProvider/'+id,
+        method: 'get',
+    })
+}
+
 
 
 /**
@@ -142,6 +170,14 @@
 export const updateTmsDispatchOrder: requestType = (data) => {
     return request({
         url: '/tms/tmsDispatchOrder',
+        method: 'put',
+        data
+    })
+}
+
+export const ypdddjSumbit: requestType = (data) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/ypdddj',
         method: 'put',
         data
     })
@@ -163,15 +199,48 @@
         method: 'get'
     })
 }
+
+export const initYSGenerate: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/initYSGenerate/' + id,
+        method: 'get'
+    })
+}
+export const initYFGenerate: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/initYFGenerate/' + id,
+        method: 'get'
+    })
+}
 export const dropHook: requestType = (id) => {
     return request({
         url: '/tms/tmsDispatchOrder/dropHook/' + id,
         method: 'get'
     })
 }
+export const checkCloseOrder: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/checkCloseOrder/' + id,
+        method: 'get'
+    })
+}
 export const connectHang: requestType = (data) => {
     return request({
         url: '/tms/tmsDispatchOrder/connectHang',
+        method: 'post',
+        data
+    })
+}
+export const closeOrder: requestType = (data) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/closeOrder',
+        method: 'post',
+        data
+    })
+}
+export const printDispatchOrder: requestType = (data) => {
+    return request({
+        url: '/tms/tmsDispatchOrder/printDispatchOrder',
         method: 'post',
         data
     })
@@ -201,3 +270,22 @@
         download('/tms/tmsDispatchOrder/export', query);
     })
 }
+export const importTemplateTmsDispatchOrder: requestType = (query) => {
+    return new Promise<any>(() => {
+        download('/tms/tmsDispatchOrder/importTemplate', query);
+    })
+}
+/* 瀵煎叆鍘嗗彶璁板綍 */
+export const tmsTmsDispatchOrderImportLog: requestType = (id) => {
+    return request({
+        url: '/tms/tmsDispatchOrderImportLog/list' ,
+        method: 'get'
+    })
+}
+export const saveTmsFinanceDetail2:requestType = (data) => {
+    return request({
+        url: '/tms/tmsFinanceDetail/save2',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file

--
Gitblit v1.8.0