From 00be30b877dacd58befbfb0638486dd36ab9869b Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 14 七月 2025 07:54:33 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-admin/src/views/base/taskSts/index.vue | 2
zy-asrs-admin/src/views/loc/loc/index.vue | 1
zy-asrs-admin/src/views/asrs/waveDetl/index.vue | 2
zy-asrs-admin/src/views/base/loc/index.vue | 2
zy-asrs-admin/src/views/system/dept/index.vue | 1
zy-asrs-admin/src/views/base/zpalletBarcode/index.vue | 1
zy-asrs-admin/src/views/log/viewStayTime/index.vue | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 22 ++++++-
zy-asrs-admin/src/views/asrs/taskDetlFieldLog/index.vue | 2
zy-asrs-admin/src/components/order/order/order.vue | 2
zy-asrs-admin/src/views/in/waitPakin/index.vue | 1
zy-asrs-admin/src/views/system/user/index.vue | 1
zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue | 12 +++
zy-asrs-admin/src/views/out/waveSeed/index.vue | 1
zy-asrs-admin/src/views/strategy/circleRule/index.vue | 3
zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue | 1
zy-asrs-admin/src/components/order/order/orderIn.vue | 2
zy-asrs-admin/src/views/log/viewInOut/index.vue | 1
zy-asrs-admin/src/views/task/task/index.vue | 1
zy-asrs-admin/src/views/strategy/lanewayRule/index.vue | 1
zy-asrs-admin/src/views/system/host/index.vue | 1
zy-asrs-admin/src/views/asrs/taskLog/index.vue | 2
zy-asrs-admin/src/views/asrs/orderDetlField/index.vue | 2
zy-asrs-admin/src/views/base/locSts/index.vue | 2
zy-asrs-admin/src/views/base/operationPort/index.vue | 2
zy-asrs-admin/src/views/system/operationRecord/index.vue | 1
zy-asrs-admin/src/views/base/tag/index.vue | 2
zy-asrs-admin/src/views/log/viewWorkIn/index.vue | 1
zy-asrs-admin/src/views/system/role/index.vue | 1
zy-asrs-admin/src/components/mat/matQuery/index.vue | 1
zy-asrs-admin/src/views/task/taskLog/index.vue | 1
zy-asrs-admin/src/components/mat/selectMat/index.vue | 2
zy-asrs-admin/src/views/out/platform/index.vue | 1
zy-asrs-admin/src/views/system/language/index.vue | 1
zy-asrs-admin/src/views/strategy/orderNoRule/index.vue | 1
zy-asrs-admin/src/views/system/userLogin/index.vue | 1
zy-asrs-admin/src/views/base/locArea/index.vue | 2
zy-asrs-admin/src/views/system/cacheStatistics/index.vue | 1
zy-asrs-admin/src/views/system/menu/index.vue | 1
zy-asrs-admin/src/views/strategy/shelvesRuleDetl/index.vue | 1
zy-asrs-admin/src/components/orderLog/index.vue | 2
zy-asrs-admin/src/views/asrs/orderDetlFieldLog/index.vue | 2
zy-asrs-admin/src/views/asrs/waveLog/index.vue | 2
zy-asrs-admin/src/views/loc/locMap/locMap.vue | 1
zy-asrs-admin/src/views/out/cacheSite/index.vue | 1
zy-asrs-admin/src/views/asrs/platformDetlLog/index.vue | 2
zy-asrs-admin/src/views/base/locAreaType/index.vue | 2
zy-asrs-admin/src/views/out/platformDetl/index.vue | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java | 10 +-
zy-asrs-admin/src/views/log/viewWorkOut/index.vue | 1
zy-asrs-admin/src/views/order/orderLog/index.vue | 1
zy-asrs-admin/src/views/config/matField/index.vue | 1
zy-asrs-admin/src/views/task/taskDetl/index.vue | 1
zy-asrs-admin/src/views/asrs/waveDetlLog/index.vue | 2
zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue | 1
zy-asrs-admin/src/views/base/locType/index.vue | 2
zy-asrs-admin/src/views/base/orderType/index.vue | 2
zy-asrs-admin/src/views/strategy/suggestLocRule/index.vue | 1
zy-asrs-admin/src/views/in/waitPakinLog/index.vue | 1
zy-asrs-admin/src/views/out/wave/index.vue | 1
zy-asrs-admin/src/views/order/orderDetl/index.vue | 1
zy-asrs-admin/src/views/strategy/shelvesRule/index.vue | 1
zy-asrs-admin/src/views/base/mat/index.vue | 2
zy-asrs-admin/src/utils/request.js | 24 ++++----
zy-asrs-admin/src/views/base/locTypeBind/index.vue | 2
zy-asrs-admin/src/views/base/taskType/index.vue | 2
zy-asrs-admin/src/views/order/orderDetlLog/index.vue | 1
zy-asrs-admin/src/views/system/dict/index.vue | 1
zy-asrs-admin/src/views/task/taskDetlLog/index.vue | 1
zy-asrs-admin/src/views/base/orderSettle/index.vue | 2
zy-asrs-admin/src/views/asrs/waveOrderRule/index.vue | 2
zy-asrs-admin/src/views/strategy/waitPakinRule/index.vue | 1
zy-asrs-admin/src/views/asrs/taskDetlField/index.vue | 2
zy-asrs-admin/src/components/order/order/orderOut.vue | 1
zy-asrs-admin/src/views/loc/locDetl/index.vue | 1
75 files changed, 143 insertions(+), 25 deletions(-)
diff --git a/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue b/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue
index 6e27d01..88b8cfa 100644
--- a/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue
+++ b/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue
@@ -194,6 +194,12 @@
}
}
+const onPageChange = (page, size) => {
+ currentPage = page;
+ pageSize = size;
+ getPage();
+}
+
function getPage() {
state.loading = true;
@@ -205,7 +211,7 @@
let result = resp.data;
if (result.code == 200) {
let data = result.data;
- tableData.value = data.records;
+ tableData.value = data;
state.loading = false;
} else if (result.code === 401) {
@@ -243,6 +249,7 @@
}
const onSearch = () => {
+ currentPage = 1;
getPage()
}
@@ -281,7 +288,8 @@
style="width: 200px;" @search="onSearch" />
</div>
<a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
- :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id" :scroll="{ y: 768 }"
+ :pagination="{ total: tableData.total, onChange: onPageChange }"
+ :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id" :scroll="{ y: 768 }"
:columns="state.columns" :loading="state.loading">
</a-table>
</a-modal>
diff --git a/zy-asrs-admin/src/components/mat/matQuery/index.vue b/zy-asrs-admin/src/components/mat/matQuery/index.vue
index 4dc91f2..25da040 100644
--- a/zy-asrs-admin/src/components/mat/matQuery/index.vue
+++ b/zy-asrs-admin/src/components/mat/matQuery/index.vue
@@ -336,6 +336,7 @@
}
const onSearch = () => {
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/components/mat/selectMat/index.vue b/zy-asrs-admin/src/components/mat/selectMat/index.vue
index c746c44..bce7145 100644
--- a/zy-asrs-admin/src/components/mat/selectMat/index.vue
+++ b/zy-asrs-admin/src/components/mat/selectMat/index.vue
@@ -323,6 +323,8 @@
}
const onSearch = () => {
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/components/order/order/order.vue b/zy-asrs-admin/src/components/order/order/order.vue
index e97fd03..b2cc644 100644
--- a/zy-asrs-admin/src/components/order/order/order.vue
+++ b/zy-asrs-admin/src/components/order/order/order.vue
@@ -228,6 +228,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/components/order/order/orderIn.vue b/zy-asrs-admin/src/components/order/order/orderIn.vue
index 827d393..fbcac4e 100644
--- a/zy-asrs-admin/src/components/order/order/orderIn.vue
+++ b/zy-asrs-admin/src/components/order/order/orderIn.vue
@@ -252,6 +252,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 15ecfb5..2551e97 100644
--- a/zy-asrs-admin/src/components/order/order/orderOut.vue
+++ b/zy-asrs-admin/src/components/order/order/orderOut.vue
@@ -280,6 +280,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/components/orderLog/index.vue b/zy-asrs-admin/src/components/orderLog/index.vue
index 5de80e4..5e808b1 100644
--- a/zy-asrs-admin/src/components/orderLog/index.vue
+++ b/zy-asrs-admin/src/components/orderLog/index.vue
@@ -212,6 +212,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/utils/request.js b/zy-asrs-admin/src/utils/request.js
index ef3de81..57f0ed3 100644
--- a/zy-asrs-admin/src/utils/request.js
+++ b/zy-asrs-admin/src/utils/request.js
@@ -7,12 +7,12 @@
})
export const get = async (url, params) => {
- if (params?.condition != null && params?.condition != undefined && params?.condition != "") {
- params.current = 1
- }
- if (params?._param != null && params?._param != undefined && hasNonEmptyProperty(params?._param)) {
- data.current = 1
- }
+ // if (params?.condition != null && params?.condition != undefined && params?.condition != "") {
+ // params.current = 1
+ // }
+ // if (params?._param != null && params?._param != undefined && hasNonEmptyProperty(params?._param)) {
+ // data.current = 1
+ // }
return instance({
url: url,
@@ -32,12 +32,12 @@
}
export const post = async (url, data) => {
- if (data?.condition != null && data?.condition != undefined && data?.condition != "") {
- data.current = 1
- }
- if (data._param != null && data._param != undefined && hasNonEmptyProperty(data?._param)) {
- data.current = 1
- }
+ // if (data?.condition != null && data?.condition != undefined && data?.condition != "") {
+ // data.current = 1
+ // }
+ // if (data._param != null && data._param != undefined && hasNonEmptyProperty(data?._param)) {
+ // data.current = 1
+ // }
return instance({
url: url,
method: 'post',
diff --git a/zy-asrs-admin/src/views/asrs/orderDetlField/index.vue b/zy-asrs-admin/src/views/asrs/orderDetlField/index.vue
index 3203439..c30234f 100644
--- a/zy-asrs-admin/src/views/asrs/orderDetlField/index.vue
+++ b/zy-asrs-admin/src/views/asrs/orderDetlField/index.vue
@@ -182,7 +182,7 @@
};
const onSearch = () => {
- // console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/asrs/orderDetlFieldLog/index.vue b/zy-asrs-admin/src/views/asrs/orderDetlFieldLog/index.vue
index ade2714..69d0507 100644
--- a/zy-asrs-admin/src/views/asrs/orderDetlFieldLog/index.vue
+++ b/zy-asrs-admin/src/views/asrs/orderDetlFieldLog/index.vue
@@ -184,6 +184,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/asrs/platformDetlLog/index.vue b/zy-asrs-admin/src/views/asrs/platformDetlLog/index.vue
index b0d8c95..dcc0776 100644
--- a/zy-asrs-admin/src/views/asrs/platformDetlLog/index.vue
+++ b/zy-asrs-admin/src/views/asrs/platformDetlLog/index.vue
@@ -231,6 +231,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/asrs/taskDetlField/index.vue b/zy-asrs-admin/src/views/asrs/taskDetlField/index.vue
index dae40ff..01f0ac7 100644
--- a/zy-asrs-admin/src/views/asrs/taskDetlField/index.vue
+++ b/zy-asrs-admin/src/views/asrs/taskDetlField/index.vue
@@ -184,6 +184,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/asrs/taskDetlFieldLog/index.vue b/zy-asrs-admin/src/views/asrs/taskDetlFieldLog/index.vue
index 921621b..2886508 100644
--- a/zy-asrs-admin/src/views/asrs/taskDetlFieldLog/index.vue
+++ b/zy-asrs-admin/src/views/asrs/taskDetlFieldLog/index.vue
@@ -183,6 +183,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/asrs/taskLog/index.vue b/zy-asrs-admin/src/views/asrs/taskLog/index.vue
index 5079a54..2844572 100644
--- a/zy-asrs-admin/src/views/asrs/taskLog/index.vue
+++ b/zy-asrs-admin/src/views/asrs/taskLog/index.vue
@@ -219,6 +219,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/asrs/waveDetl/index.vue b/zy-asrs-admin/src/views/asrs/waveDetl/index.vue
index 10b30c3..a476c3e 100644
--- a/zy-asrs-admin/src/views/asrs/waveDetl/index.vue
+++ b/zy-asrs-admin/src/views/asrs/waveDetl/index.vue
@@ -184,6 +184,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/asrs/waveDetlLog/index.vue b/zy-asrs-admin/src/views/asrs/waveDetlLog/index.vue
index 829aea7..0f3df4c 100644
--- a/zy-asrs-admin/src/views/asrs/waveDetlLog/index.vue
+++ b/zy-asrs-admin/src/views/asrs/waveDetlLog/index.vue
@@ -223,6 +223,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/asrs/waveLog/index.vue b/zy-asrs-admin/src/views/asrs/waveLog/index.vue
index ac86c6f..c149e97 100644
--- a/zy-asrs-admin/src/views/asrs/waveLog/index.vue
+++ b/zy-asrs-admin/src/views/asrs/waveLog/index.vue
@@ -182,6 +182,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/asrs/waveOrderRule/index.vue b/zy-asrs-admin/src/views/asrs/waveOrderRule/index.vue
index 5749bd9..49e9912 100644
--- a/zy-asrs-admin/src/views/asrs/waveOrderRule/index.vue
+++ b/zy-asrs-admin/src/views/asrs/waveOrderRule/index.vue
@@ -184,6 +184,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/loc/index.vue b/zy-asrs-admin/src/views/base/loc/index.vue
index 2a8e6c7..6ee7b1d 100644
--- a/zy-asrs-admin/src/views/base/loc/index.vue
+++ b/zy-asrs-admin/src/views/base/loc/index.vue
@@ -245,7 +245,7 @@
};
const onSearch = () => {
- // console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/locArea/index.vue b/zy-asrs-admin/src/views/base/locArea/index.vue
index 24d3ff1..a346c69 100644
--- a/zy-asrs-admin/src/views/base/locArea/index.vue
+++ b/zy-asrs-admin/src/views/base/locArea/index.vue
@@ -180,6 +180,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/locAreaType/index.vue b/zy-asrs-admin/src/views/base/locAreaType/index.vue
index 28dec81..43a1cbf 100644
--- a/zy-asrs-admin/src/views/base/locAreaType/index.vue
+++ b/zy-asrs-admin/src/views/base/locAreaType/index.vue
@@ -194,6 +194,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/locSts/index.vue b/zy-asrs-admin/src/views/base/locSts/index.vue
index b26e7a1..5d3d8cf 100644
--- a/zy-asrs-admin/src/views/base/locSts/index.vue
+++ b/zy-asrs-admin/src/views/base/locSts/index.vue
@@ -182,6 +182,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/locType/index.vue b/zy-asrs-admin/src/views/base/locType/index.vue
index a0fb00d..4702cf3 100644
--- a/zy-asrs-admin/src/views/base/locType/index.vue
+++ b/zy-asrs-admin/src/views/base/locType/index.vue
@@ -201,6 +201,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/locTypeBind/index.vue b/zy-asrs-admin/src/views/base/locTypeBind/index.vue
index 81ca934..2c604ba 100644
--- a/zy-asrs-admin/src/views/base/locTypeBind/index.vue
+++ b/zy-asrs-admin/src/views/base/locTypeBind/index.vue
@@ -186,6 +186,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/mat/index.vue b/zy-asrs-admin/src/views/base/mat/index.vue
index d155b65..9ab681f 100644
--- a/zy-asrs-admin/src/views/base/mat/index.vue
+++ b/zy-asrs-admin/src/views/base/mat/index.vue
@@ -426,6 +426,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/operationPort/index.vue b/zy-asrs-admin/src/views/base/operationPort/index.vue
index b5fb862..afd6a79 100644
--- a/zy-asrs-admin/src/views/base/operationPort/index.vue
+++ b/zy-asrs-admin/src/views/base/operationPort/index.vue
@@ -169,6 +169,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/orderSettle/index.vue b/zy-asrs-admin/src/views/base/orderSettle/index.vue
index 2a8a213..b604de3 100644
--- a/zy-asrs-admin/src/views/base/orderSettle/index.vue
+++ b/zy-asrs-admin/src/views/base/orderSettle/index.vue
@@ -181,6 +181,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/orderType/index.vue b/zy-asrs-admin/src/views/base/orderType/index.vue
index d73c571..ec8924b 100644
--- a/zy-asrs-admin/src/views/base/orderType/index.vue
+++ b/zy-asrs-admin/src/views/base/orderType/index.vue
@@ -188,6 +188,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/tag/index.vue b/zy-asrs-admin/src/views/base/tag/index.vue
index cf4a5c1..60e26a8 100644
--- a/zy-asrs-admin/src/views/base/tag/index.vue
+++ b/zy-asrs-admin/src/views/base/tag/index.vue
@@ -221,6 +221,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/taskSts/index.vue b/zy-asrs-admin/src/views/base/taskSts/index.vue
index 6b74a34..c8946ed 100644
--- a/zy-asrs-admin/src/views/base/taskSts/index.vue
+++ b/zy-asrs-admin/src/views/base/taskSts/index.vue
@@ -175,6 +175,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/taskType/index.vue b/zy-asrs-admin/src/views/base/taskType/index.vue
index bcd59cd..48ce1b5 100644
--- a/zy-asrs-admin/src/views/base/taskType/index.vue
+++ b/zy-asrs-admin/src/views/base/taskType/index.vue
@@ -174,6 +174,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
index 39bf8bd..e9dcee6 100644
--- a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
+++ b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
@@ -191,6 +191,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/config/matField/index.vue b/zy-asrs-admin/src/views/config/matField/index.vue
index c6fda96..fcef26e 100644
--- a/zy-asrs-admin/src/views/config/matField/index.vue
+++ b/zy-asrs-admin/src/views/config/matField/index.vue
@@ -203,6 +203,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/in/waitPakin/index.vue b/zy-asrs-admin/src/views/in/waitPakin/index.vue
index 3b8e9c6..610ba2a 100644
--- a/zy-asrs-admin/src/views/in/waitPakin/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakin/index.vue
@@ -229,6 +229,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/in/waitPakinLog/index.vue b/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
index 9047d02..13b89a9 100644
--- a/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
@@ -220,6 +220,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/loc/loc/index.vue b/zy-asrs-admin/src/views/loc/loc/index.vue
index 846097f..9ad0314 100644
--- a/zy-asrs-admin/src/views/loc/loc/index.vue
+++ b/zy-asrs-admin/src/views/loc/loc/index.vue
@@ -230,6 +230,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 713a7b5..99a27c4 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -334,6 +334,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/loc/locMap/locMap.vue b/zy-asrs-admin/src/views/loc/locMap/locMap.vue
index ebc2c82..ab6c173 100644
--- a/zy-asrs-admin/src/views/loc/locMap/locMap.vue
+++ b/zy-asrs-admin/src/views/loc/locMap/locMap.vue
@@ -201,6 +201,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/log/viewInOut/index.vue b/zy-asrs-admin/src/views/log/viewInOut/index.vue
index 27bcd5f..7580546 100644
--- a/zy-asrs-admin/src/views/log/viewInOut/index.vue
+++ b/zy-asrs-admin/src/views/log/viewInOut/index.vue
@@ -109,6 +109,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/log/viewStayTime/index.vue b/zy-asrs-admin/src/views/log/viewStayTime/index.vue
index 209f445..b5aa8f7 100644
--- a/zy-asrs-admin/src/views/log/viewStayTime/index.vue
+++ b/zy-asrs-admin/src/views/log/viewStayTime/index.vue
@@ -165,6 +165,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue b/zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue
index 8983e75..150da37 100644
--- a/zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue
+++ b/zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue
@@ -109,6 +109,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue b/zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue
index c9d75d9..71d64a6 100644
--- a/zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue
+++ b/zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue
@@ -109,6 +109,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/log/viewWorkIn/index.vue b/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
index 948b846..51c24f8 100644
--- a/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
+++ b/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
@@ -177,6 +177,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/log/viewWorkOut/index.vue b/zy-asrs-admin/src/views/log/viewWorkOut/index.vue
index eb74298..21ceb6e 100644
--- a/zy-asrs-admin/src/views/log/viewWorkOut/index.vue
+++ b/zy-asrs-admin/src/views/log/viewWorkOut/index.vue
@@ -160,6 +160,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/order/orderDetl/index.vue b/zy-asrs-admin/src/views/order/orderDetl/index.vue
index c83d85d..79809c0 100644
--- a/zy-asrs-admin/src/views/order/orderDetl/index.vue
+++ b/zy-asrs-admin/src/views/order/orderDetl/index.vue
@@ -227,6 +227,7 @@
};
const onSearch = () => {
+ currentPage = 1;
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/order/orderDetlLog/index.vue b/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
index 0a99690..8625ca7 100644
--- a/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
+++ b/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
@@ -229,6 +229,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/order/orderLog/index.vue b/zy-asrs-admin/src/views/order/orderLog/index.vue
index 447c285..f49de98 100644
--- a/zy-asrs-admin/src/views/order/orderLog/index.vue
+++ b/zy-asrs-admin/src/views/order/orderLog/index.vue
@@ -200,6 +200,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/out/cacheSite/index.vue b/zy-asrs-admin/src/views/out/cacheSite/index.vue
index c550e71..391b708 100644
--- a/zy-asrs-admin/src/views/out/cacheSite/index.vue
+++ b/zy-asrs-admin/src/views/out/cacheSite/index.vue
@@ -210,6 +210,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/out/platform/index.vue b/zy-asrs-admin/src/views/out/platform/index.vue
index e5fc0dc..51e7b02 100644
--- a/zy-asrs-admin/src/views/out/platform/index.vue
+++ b/zy-asrs-admin/src/views/out/platform/index.vue
@@ -168,6 +168,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/out/platformDetl/index.vue b/zy-asrs-admin/src/views/out/platformDetl/index.vue
index f32a286..f737738 100644
--- a/zy-asrs-admin/src/views/out/platformDetl/index.vue
+++ b/zy-asrs-admin/src/views/out/platformDetl/index.vue
@@ -231,6 +231,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/out/wave/index.vue b/zy-asrs-admin/src/views/out/wave/index.vue
index 6a4b61a..9f18684 100644
--- a/zy-asrs-admin/src/views/out/wave/index.vue
+++ b/zy-asrs-admin/src/views/out/wave/index.vue
@@ -278,6 +278,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/out/waveSeed/index.vue b/zy-asrs-admin/src/views/out/waveSeed/index.vue
index 63cdc00..cd95599 100644
--- a/zy-asrs-admin/src/views/out/waveSeed/index.vue
+++ b/zy-asrs-admin/src/views/out/waveSeed/index.vue
@@ -223,6 +223,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/strategy/circleRule/index.vue b/zy-asrs-admin/src/views/strategy/circleRule/index.vue
index 42632c2..fedd304 100644
--- a/zy-asrs-admin/src/views/strategy/circleRule/index.vue
+++ b/zy-asrs-admin/src/views/strategy/circleRule/index.vue
@@ -196,7 +196,8 @@
};
const onSearch = () => {
- // console.log('search');
+ // console.log('search');currentPage = 1;
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/strategy/lanewayRule/index.vue b/zy-asrs-admin/src/views/strategy/lanewayRule/index.vue
index bdab037..8d6f8e5 100644
--- a/zy-asrs-admin/src/views/strategy/lanewayRule/index.vue
+++ b/zy-asrs-admin/src/views/strategy/lanewayRule/index.vue
@@ -183,6 +183,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/strategy/orderNoRule/index.vue b/zy-asrs-admin/src/views/strategy/orderNoRule/index.vue
index bfa6dbe..49263b6 100644
--- a/zy-asrs-admin/src/views/strategy/orderNoRule/index.vue
+++ b/zy-asrs-admin/src/views/strategy/orderNoRule/index.vue
@@ -190,6 +190,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue b/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue
index 5db4243..bea211e 100644
--- a/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue
+++ b/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue
@@ -183,6 +183,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/strategy/shelvesRuleDetl/index.vue b/zy-asrs-admin/src/views/strategy/shelvesRuleDetl/index.vue
index 622ff94..3576fef 100644
--- a/zy-asrs-admin/src/views/strategy/shelvesRuleDetl/index.vue
+++ b/zy-asrs-admin/src/views/strategy/shelvesRuleDetl/index.vue
@@ -171,6 +171,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/strategy/suggestLocRule/index.vue b/zy-asrs-admin/src/views/strategy/suggestLocRule/index.vue
index 52cf47e..1bd5756 100644
--- a/zy-asrs-admin/src/views/strategy/suggestLocRule/index.vue
+++ b/zy-asrs-admin/src/views/strategy/suggestLocRule/index.vue
@@ -225,6 +225,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/strategy/waitPakinRule/index.vue b/zy-asrs-admin/src/views/strategy/waitPakinRule/index.vue
index 0c935c4..88d243a 100644
--- a/zy-asrs-admin/src/views/strategy/waitPakinRule/index.vue
+++ b/zy-asrs-admin/src/views/strategy/waitPakinRule/index.vue
@@ -176,6 +176,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/system/cacheStatistics/index.vue b/zy-asrs-admin/src/views/system/cacheStatistics/index.vue
index 2b12cf4..35270fe 100644
--- a/zy-asrs-admin/src/views/system/cacheStatistics/index.vue
+++ b/zy-asrs-admin/src/views/system/cacheStatistics/index.vue
@@ -191,6 +191,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/system/dept/index.vue b/zy-asrs-admin/src/views/system/dept/index.vue
index aee9783..741a1a8 100644
--- a/zy-asrs-admin/src/views/system/dept/index.vue
+++ b/zy-asrs-admin/src/views/system/dept/index.vue
@@ -209,6 +209,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/system/dict/index.vue b/zy-asrs-admin/src/views/system/dict/index.vue
index 2fe784c..3d3ecc0 100644
--- a/zy-asrs-admin/src/views/system/dict/index.vue
+++ b/zy-asrs-admin/src/views/system/dict/index.vue
@@ -200,6 +200,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/system/host/index.vue b/zy-asrs-admin/src/views/system/host/index.vue
index ca1ad7f..0fbe894 100644
--- a/zy-asrs-admin/src/views/system/host/index.vue
+++ b/zy-asrs-admin/src/views/system/host/index.vue
@@ -148,6 +148,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/system/language/index.vue b/zy-asrs-admin/src/views/system/language/index.vue
index c1e98e7..e101513 100644
--- a/zy-asrs-admin/src/views/system/language/index.vue
+++ b/zy-asrs-admin/src/views/system/language/index.vue
@@ -162,6 +162,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/system/menu/index.vue b/zy-asrs-admin/src/views/system/menu/index.vue
index 24ce303..e4bb1ea 100644
--- a/zy-asrs-admin/src/views/system/menu/index.vue
+++ b/zy-asrs-admin/src/views/system/menu/index.vue
@@ -111,6 +111,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/system/operationRecord/index.vue b/zy-asrs-admin/src/views/system/operationRecord/index.vue
index c35e88b..b882ddc 100644
--- a/zy-asrs-admin/src/views/system/operationRecord/index.vue
+++ b/zy-asrs-admin/src/views/system/operationRecord/index.vue
@@ -211,6 +211,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/system/role/index.vue b/zy-asrs-admin/src/views/system/role/index.vue
index 6dc88c5..8b87ed0 100644
--- a/zy-asrs-admin/src/views/system/role/index.vue
+++ b/zy-asrs-admin/src/views/system/role/index.vue
@@ -168,6 +168,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/system/user/index.vue b/zy-asrs-admin/src/views/system/user/index.vue
index 6d856f4..fe324c8 100644
--- a/zy-asrs-admin/src/views/system/user/index.vue
+++ b/zy-asrs-admin/src/views/system/user/index.vue
@@ -312,6 +312,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/system/userLogin/index.vue b/zy-asrs-admin/src/views/system/userLogin/index.vue
index fbe97e5..6ba8718 100644
--- a/zy-asrs-admin/src/views/system/userLogin/index.vue
+++ b/zy-asrs-admin/src/views/system/userLogin/index.vue
@@ -163,6 +163,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/task/task/index.vue b/zy-asrs-admin/src/views/task/task/index.vue
index 6643796..c7f978c 100644
--- a/zy-asrs-admin/src/views/task/task/index.vue
+++ b/zy-asrs-admin/src/views/task/task/index.vue
@@ -238,6 +238,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/task/taskDetl/index.vue b/zy-asrs-admin/src/views/task/taskDetl/index.vue
index 1909073..de7ab3e 100644
--- a/zy-asrs-admin/src/views/task/taskDetl/index.vue
+++ b/zy-asrs-admin/src/views/task/taskDetl/index.vue
@@ -234,6 +234,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/task/taskDetlLog/index.vue b/zy-asrs-admin/src/views/task/taskDetlLog/index.vue
index 8557d67..a48e5ee 100644
--- a/zy-asrs-admin/src/views/task/taskDetlLog/index.vue
+++ b/zy-asrs-admin/src/views/task/taskDetlLog/index.vue
@@ -241,6 +241,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/task/taskLog/index.vue b/zy-asrs-admin/src/views/task/taskLog/index.vue
index 0c7bee6..ad5a5ec 100644
--- a/zy-asrs-admin/src/views/task/taskLog/index.vue
+++ b/zy-asrs-admin/src/views/task/taskLog/index.vue
@@ -239,6 +239,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
index 6c98627..bd1e650 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
@@ -67,11 +67,11 @@
PageParam<ViewLocDetl, BaseParam> pageParam = new PageParam<>(baseParam, ViewLocDetl.class);
QueryWrapper<ViewLocDetl> queryWrapper = pageParam.buildWrapper(true);
- List<Long> locIds = locService.listBySts(LocStsType.F.val());
- if (locIds.isEmpty()) {
- locIds.add(-1L);
- }
- queryWrapper.in("loc_id", locIds);
+// List<Long> locIds = locService.listBySts(LocStsType.F.val());
+// if (locIds.isEmpty()) {
+// locIds.add(-1L);
+// }
+// queryWrapper.in("loc_id", locIds);
PageParam<ViewLocDetl, BaseParam> data = locDetlService.getPage(pageParam, queryWrapper);
return R.ok().add(data);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
index 4b94508..7a6155e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
@@ -15,15 +15,15 @@
generator.frontendPrefixPath = "zy-asrs-admin/";
generator.sqlOsType = SqlOsType.MYSQL;
- generator.url="localhost:3306/wms_dev";
+ generator.url="localhost:3306/wms_dev_test";
generator.username="root";
generator.password="34821015";
// generator.url="47.97.1.152:51433;databasename=jkasrs";
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="sys_cache_statistics";
- generator.tableName="绯荤粺缂撳瓨缁熻";
+ generator.table="man_container";
+ generator.tableName="瀹瑰櫒绠＄悊";
generator.rootPackagePath="com.zy.asrs.wms";
generator.packagePath="com.zy.asrs.wms.asrs";
@@ -31,3 +31,19 @@
}
}
+/*
+ CREATE TABLE `man_tablename` (
+ `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'ID',
+ `code` VARCHAR(255) DEFAULT NULL COMMENT '缂栧彿',
+ `name` VARCHAR(255) DEFAULT NULL COMMENT '鍚嶇О(*)',
+ `status` INT(1) NOT NULL DEFAULT '1' COMMENT '鐘舵�亄1:姝ｅ父,0:鍐荤粨}',
+ `deleted` INT(1) NOT NULL DEFAULT '0' COMMENT '鏄惁鍒犻櫎{1:鏄�,0:鍚',
+ `tenant_id` INT(11) DEFAULT NULL COMMENT '绉熸埛[sys_tenant]',
+ `create_by` BIGINT(20) DEFAULT NULL COMMENT '娣诲姞浜哄憳[sys_user]',
+ `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '娣诲姞鏃堕棿',
+ `update_by` BIGINT(20) DEFAULT NULL COMMENT '淇敼浜哄憳[sys_user]',
+ `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿',
+ `memo` VARCHAR(255) DEFAULT NULL COMMENT '澶囨敞',
+ PRIMARY KEY (`id`)
+ ) ENGINE=INNODB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
+ */
\ No newline at end of file
--
Gitblit v1.9.1