From 439e3b0f076280311b7cd4251a95820730242780 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 07 八月 2024 10:43:33 +0800
Subject: [PATCH] 一些更新
---
src/api/tigerapi/wms/wms_item_his.ts | 77 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/src/api/tigerapi/wms/wms_item_his.ts b/src/api/tigerapi/wms/wms_item_his.ts
index 0a55047..9b45581 100644
--- a/src/api/tigerapi/wms/wms_item_his.ts
+++ b/src/api/tigerapi/wms/wms_item_his.ts
@@ -10,9 +10,9 @@
* 鑾峰彇瀹炴椂搴撳瓨鍒嗛〉鍒楄〃
*/
export const getWmsItemHisListByPage = async (params: WmsItemPageParams) => {
- let order = ''
+ let order = '';
if (params.order != undefined) {
- order = params.order == 'descend' ? (params.field + ' desc') : params.field
+ order = params.order == 'descend' ? params.field + ' desc' : params.field;
}
let sqlcmd = '1=1';
if (params?.SN != undefined && params?.SN != '') {
@@ -27,57 +27,64 @@
if (params?.TRACE_INFO != undefined && params?.TRACE_INFO != '') {
sqlcmd += " And TRACE_INFO like '" + params?.TRACE_INFO + "%'";
}
- var option ={
- UserId:useUserStore().getUserInfo.userId as string,
- ByOrg:true,
- OrgCode:useUserStore().getUserInfo.orgCode as string
- }
+ const option = {
+ UserId: useUserStore().getUserInfo.userId as string,
+ ByOrg: true,
+ OrgCode: useUserStore().getUserInfo.orgCode as string,
+ };
//const rParams = genActionPage('V_WMS_ITEM_HIS', sqlcmd, params.page, params.pageSize);
- if(!isNullOrEmpty(params.page)){
- const usParams = genAction('V_WMS_ITEM_HIS', {
- QueryAble_T: '',
- where: sqlcmd,
- order: order,
- page: {
- pageAble_T: 'string',
- draw: 1,
- pageIndex: params.page,
- pageSize: params.pageSize,
- },option
- },option);
+ if (!isNullOrEmpty(params.page)) {
+ const usParams = genAction(
+ 'V_WMS_ITEM_HIS',
+ {
+ QueryAble_T: '',
+ where: sqlcmd,
+ order: order,
+ page: {
+ pageAble_T: 'string',
+ draw: 1,
+ pageIndex: params.page,
+ pageSize: params.pageSize,
+ },
+ option,
+ },
+ option,
+ );
return getWmsItemListByPageAsync(usParams);
- }else{
- const usParams = genAction('V_WMS_ITEM_HIS', {
- QueryAble_T: '',
- where: sqlcmd,
- option
- },option);
+ } else {
+ const usParams = genAction(
+ 'V_WMS_ITEM_HIS',
+ {
+ QueryAble_T: '',
+ where: sqlcmd,
+ option,
+ },
+ option,
+ );
return getWmsItemListByPageAsync(usParams);
}
-
};
async function getWmsItemListByPageAsync(params: any) {
const data = await defHttp.post(
- { url: Api.QueryUrl, params,timeout: 10*60*1000 },
+ { url: Api.QueryUrl, params, timeout: 10 * 60 * 1000 },
{
isTransformResponse: false,
},
);
- let model = {}
- if(isNullOrEmpty(data.Data.page)){
- model = {
+ let model = {};
+ if (isNullOrEmpty(data.Data.page)) {
+ model = {
items: data.Data.Items,
};
- }else{
- model = {
+ } else {
+ model = {
items: data.Data.page.data,
total: data.Data.page.totals,
};
}
-
+
return model;
}
-
//涓嬫媺鍒楄〃
// STATUSs 浠撳簱鐘舵��
@@ -91,4 +98,4 @@
// apiUrl: globSetting.taskApiUrl
},
);
-};
\ No newline at end of file
+};
--
Gitblit v1.9.3