diff --git a/src/api/inout/erpOrder.js b/src/api/inout/erpOrder.js
new file mode 100644
index 00000000..ed85bfc1
--- /dev/null
+++ b/src/api/inout/erpOrder.js
@@ -0,0 +1,127 @@
+import axios from '@/utils/request'
+
+//--------------获取ERP数据-------------------
+export function getErpMainOrder(query) {
+ return axios({
+ url: "/warehouse/getErpMainOrder",
+ method: "get",
+ params: query
+ });
+}
+
+export function getCloudErp(query) {
+ return axios({
+ url: "/spms/erpOrder/filter",
+ method: "get",
+ params: query
+ });
+}
+
+
+export function getThirdSysOrder(query) {
+ return axios({
+ url: "/udiwms/thirdOrder/filter",
+ method: "get",
+ params: query
+ });
+}
+
+export function getErpMainOrderStatus(query) {
+ return axios({
+ url: "/warehouse/getErpMainOrderStatus",
+ method: "get",
+ params: query
+ });
+}
+
+
+export function getErpDetailOrder(query) {
+ return axios({
+ url: "/warehouse/getErpDetailOrder",
+ method: "get",
+ params: query
+ });
+}
+
+export function importErpOrder(query) {
+ return axios({
+ url: "/warehouse/importErpOrder",
+ method: "post",
+ data: query
+ });
+}
+
+export function combineErpOrder(query) {
+ return axios({
+ url: "/warehouse/combineErpOrder",
+ method: "post",
+ data: query
+ });
+}
+
+
+export function deleteErpOrder(query) {
+ return axios({
+ url: "/warehouse/deleteErpOrder",
+ method: "post",
+ data: query
+ });
+}
+
+export function selectErpOrder(query) {
+ return axios({
+ url: "/warehouse/selectErpOrder",
+ method: "post",
+ data: query
+ });
+}
+
+export function importErpStock(query) {
+ return axios({
+ url: "/warehouse/stockPrint/importErpStock",
+ method: "post",
+ data: query
+ });
+}
+
+export function repeatCheck(query) {
+ return axios({
+ url: "/warehouse/repeatCheck",
+ method: "post",
+ data: query
+ });
+}
+
+
+export function repeatPrintCheck(query) {
+ return axios({
+ url: "/warehouse/repeatPrintCheck",
+ method: "post",
+ data: query
+ });
+}
+
+export function dlErpStock(query) {
+ return axios({
+ url: "/warehouse/dlErpStock",
+ method: "get",
+ params: query
+ });
+}
+
+export function addStockOrder(query) {
+ return axios({
+ url: "/udiwms/erpOrder/addStockOrder",
+ method: "get",
+ params: query
+ });
+}
+
+export function addReceiveOrder(query) {
+ return axios({
+ url: "/udiwms/receive/addStockOrder",
+ method: "get",
+ params: query
+ });
+}
+
diff --git a/src/api/inventory/onHand.js b/src/api/inventory/onHand.js
new file mode 100644
index 00000000..69430d73
--- /dev/null
+++ b/src/api/inventory/onHand.js
@@ -0,0 +1,9 @@
+import axios from "@/utils/request";
+
+export function getOnhands(query) {
+ return axios({
+ url: "/udiwms/inv/getInvProducts",
+ method: "get",
+ params: query
+ });
+}
diff --git a/src/api/thrsys/thrOrder.js b/src/api/thrsys/thrOrder.js
new file mode 100644
index 00000000..a2c13a86
--- /dev/null
+++ b/src/api/thrsys/thrOrder.js
@@ -0,0 +1,58 @@
+import axios from "@/utils/request";
+
+export function getThrOrders(query) {
+ return axios({
+ url: "/udiwms/thrsys/getOrders",
+ method: "get",
+ params: query
+ });
+}
+
+export function getThrOrderDetails(query) {
+ return axios({
+ url: "/udiwms/thrsys/getOrderDetails",
+ method: "get",
+ params: query
+ });
+}
+
+export function delThrOrders(query) {
+ return axios({
+ url: "/udiwms/thrsys/delOrder",
+ method: "post",
+ data: query
+ });
+}
+
+export function delOrderDetail(query) {
+ return axios({
+ url: "/udiwms/thrsys/delOrderDetail",
+ method: "post",
+ data: query
+ });
+}
+
+
+export function delAll(query) {
+ return axios({
+ url: "/udiwms/thrsys/order/delAll",
+ method: "get",
+ params: query
+ });
+}
+
+export function downloadAll(query) {
+ return axios({
+ url: "/udiwms/thrsys/orders/downloadAll",
+ method: "get",
+ params: query
+ });
+}
+
+export function orderDownload(query) {
+ return axios({
+ url: "/udiwms/thrsys/orders/orderDownload",
+ method: "post",
+ data: query
+ });
+}
diff --git a/src/api/thrsys/thrOrderExport.js b/src/api/thrsys/thrOrderExport.js
new file mode 100644
index 00000000..5dd11758
--- /dev/null
+++ b/src/api/thrsys/thrOrderExport.js
@@ -0,0 +1,33 @@
+import axios from "@/utils/request";
+
+
+export function filterLog(query) {
+ return axios({
+ url: "/udiwms/thrOrder/exportLog/filter",
+ method: "get",
+ params: query
+ });
+}
+export function deleteLog(query) {
+ return axios({
+ url: "/udiwms/thrOrder/exportLog/deleteLog",
+ method: "post",
+ data: query
+ });
+}
+
+export function downloadLog(query) {
+ return axios({
+ url: "/udiwms/thrOrder/exportLog/download",
+ method: "get",
+ params: query
+ });
+}
+export function exportExcel(query) {
+ return axios({
+ url: "/udiwms/thrOrder/importLog/export",
+ method: "post",
+ data: query
+ });
+}
+
diff --git a/src/api/thrsys/thrOrderImport.js b/src/api/thrsys/thrOrderImport.js
new file mode 100644
index 00000000..c0956927
--- /dev/null
+++ b/src/api/thrsys/thrOrderImport.js
@@ -0,0 +1,24 @@
+import axios from "@/utils/request";
+
+export function filterDetail(query) {
+ return axios({
+ url: "/udiwms/thrOrder/importLog/filterDetail",
+ method: "get",
+ params: query
+ });
+}
+
+export function filterLog(query) {
+ return axios({
+ url: "/udiwms/thrOrder/importLog/filter",
+ method: "get",
+ params: query
+ });
+}
+export function deleteLog(query) {
+ return axios({
+ url: "/udiwms/thrOrder/importLog/deleteLog",
+ method: "post",
+ data: query
+ });
+}
diff --git a/src/api/thrsys/thrOrderReceive.js b/src/api/thrsys/thrOrderReceive.js
new file mode 100644
index 00000000..3ad028e8
--- /dev/null
+++ b/src/api/thrsys/thrOrderReceive.js
@@ -0,0 +1,18 @@
+import axios from "@/utils/request";
+
+export function inserThrOrderWeb(query) {
+ return axios({
+ url: "/udiwms/thrsys/order/insertWeb",
+ method: "post",
+ data: query
+ });
+}
+
+export function updateReceive(query) {
+ return axios({
+ url: "/udiwms/receive/order/update",
+ method: "post",
+ data: query
+ });
+}
+
diff --git a/src/views/thirdSys/order/thrOrder.vue b/src/views/thirdSys/order/thrOrder.vue
new file mode 100644
index 00000000..f95d5355
--- /dev/null
+++ b/src/views/thirdSys/order/thrOrder.vue
@@ -0,0 +1,423 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{
+ item.thirdSysName
+ }}
+
+
+
+
+ 单据日期:
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 导出Excel文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ status[scope.row.status] }}
+
+
+
+
+
+
+
+ 下载
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 同步至自助平台
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ status[scope.row.status] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.thirdName }}
+ {{ item.thirdId }}
+
+
+
+
+
+
+
+ 查询
+
+ 导入业务单据
+
+
+
+
+
+ 下载业务单据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ status[scope.row.status] }}
+
+
+
+
+
+
+
+ 详情
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+ 单据日期:
+
+
+
+
+
+
+ 查询
+ 选中导出
+
+ 结果全部导出
+
+ 选中上传
+
+ 一键上传
+
+ 选中下载
+
+ 结果全部下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ geActionName(scope.row.billType) }}
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+