From c89adfd5c5df23b6b102766092867adc2330ebb7 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期三, 29 五月 2024 12:51:51 +0800 Subject: [PATCH] 通用查询分页 --- src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue | 9 src/views/tigerprojects/mes/prod/biz_mes_wo/biz_mes_wo.data.ts | 9 src/api/tigerapi/system.ts | 36 + src/views/tigerprojects/wms/region/index.vue | 7 src/api/tigerapi/model/warehoueseModel.ts | 1018 +++++++++++++++++++++++++++-------------------------- src/api/tigerapi/wms/region.ts | 39 - src/views/tigerprojects/wms/region/region.data.ts | 8 7 files changed, 580 insertions(+), 546 deletions(-) diff --git a/src/api/tigerapi/model/warehoueseModel.ts b/src/api/tigerapi/model/warehoueseModel.ts index 86ebb61..398a3ab 100644 --- a/src/api/tigerapi/model/warehoueseModel.ts +++ b/src/api/tigerapi/model/warehoueseModel.ts @@ -3,7 +3,7 @@ //浠撳簱鏍� export interface HouseListItem { ID: string; - AUTH_ORG:string; + AUTH_ORG: string; HOUSE_NAME: string; HOUSE_CODE: string; PARENT_HOUSE: string; @@ -182,7 +182,7 @@ } //棰嗘枡鍗曟槑缁� export type MaterialReqDetailParams = { - BILLCODE?:string; + BILLCODE?: string; ITEM_CODE?: string; STATUS?: string; BIZTYPE?: string; @@ -190,72 +190,72 @@ export type MaterialReqDetailPageParams = BasicPageParams & MaterialReqDetailParams; export interface MaterialReqDetailListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - BILLCODE: string; - BILLLINE: string; - LINESTATUS: string; - ITEM_CODE: string; - UNITCODE: string; - PRQTY: number; - QTY: number; - DELIVERYDATE: string; - WAREHOUSECODE: string; - SOURCETYPE: number; - SOURCECODE: string; - SOURCELINE: string; - REMARK: string; - ERP_BILL_CODE: string; - ITEM_NAME: string; - OWEQTY: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + BILLCODE: string; + BILLLINE: string; + LINESTATUS: string; + ITEM_CODE: string; + UNITCODE: string; + PRQTY: number; + QTY: number; + DELIVERYDATE: string; + WAREHOUSECODE: string; + SOURCETYPE: number; + SOURCECODE: string; + SOURCELINE: string; + REMARK: string; + ERP_BILL_CODE: string; + ITEM_NAME: string; + OWEQTY: string; } //棰嗘枡鍗曟潯鐮佹槑缁� export type MaterialReqDetailSNParams = { - BILLCODE?:string; + BILLCODE?: string; ITEM_CODE?: string; - SN?:string; + SN?: string; STATUS?: string; BIZTYPE?: string; }; export type MaterialReqDetailSNPageParams = BasicPageParams & MaterialReqDetailSNParams; export interface MaterialReqDetailSNListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - ORDER_NO:string; - ORDER_LINE:string; - SN: string; - ITEM_CODE: string; - QTY: number; - STATUS: number; - LOCATION_CODE: string; - ERP_WH: string; - ALLOC_QTY: number; - SOURCE_CODE: string; - SOURCE_ORDER: string; - SOURCE_LINE: string; - LINE_NO: string; - SEGMENT: string; - SMT_NO: string; - STATION_NO: string; - FEEDER_NO: string; - FEEDER_TYPE: string; - LOAD_SEQ: number; - IS_FIRST: string; - NEED_CUTTING: string; - REMARK: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + ORDER_NO: string; + ORDER_LINE: string; + SN: string; + ITEM_CODE: string; + QTY: number; + STATUS: number; + LOCATION_CODE: string; + ERP_WH: string; + ALLOC_QTY: number; + SOURCE_CODE: string; + SOURCE_ORDER: string; + SOURCE_LINE: string; + LINE_NO: string; + SEGMENT: string; + SMT_NO: string; + STATION_NO: string; + FEEDER_NO: string; + FEEDER_TYPE: string; + LOAD_SEQ: number; + IS_FIRST: string; + NEED_CUTTING: string; + REMARK: string; } //閿�鍞嚭搴撳崟瀹炰綋 export type SaleoutorderParams = { @@ -297,29 +297,29 @@ export type SaleoutorderDetailPageParams = BasicPageParams & SaleoutorderDetailParams; export interface SaleoutorderDetailListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - BILLCODE: string; - BILLLINE: string; - LINESTATUS: string; - ITEM_CODE: string; - UNITCODE: string; - PRQTY: number; - QTY: number; - DELIVERYDATE: string; - WAREHOUSECODE: string; - SOURCETYPE: number; - SOURCECODE: string; - SOURCELINE: string; - REMARK: string; - CUST_CODE: string; - ERP_BILL_CODE: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + BILLCODE: string; + BILLLINE: string; + LINESTATUS: string; + ITEM_CODE: string; + UNITCODE: string; + PRQTY: number; + QTY: number; + DELIVERYDATE: string; + WAREHOUSECODE: string; + SOURCETYPE: number; + SOURCECODE: string; + SOURCELINE: string; + REMARK: string; + CUST_CODE: string; + ERP_BILL_CODE: string; } //閿�鍞嚭搴撳崟瀹炰綋鏉$爜鏄庣粏 export type SaleoutorderDetailSNParams = { @@ -331,36 +331,36 @@ export type SaleoutorderDetailSNPageParams = BasicPageParams & SaleoutorderDetailSNParams; export interface SaleoutorderDetailSNListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - ORDER_NO: string; - ORDER_LINE: string; - SN: string; - ITEM_CODE: string; - QTY: number; - STATUS: number; - LOCATION_CODE: string; - ERP_WH: string; - ALLOC_QTY: number; - SOURCE_CODE: string; - SOURCE_ORDER: string; - SOURCE_LINE: string; - LINE_NO: string; - SEGMENT: string; - SMT_NO: string; - STATION_NO: string; - FEEDER_NO: string; - FEEDER_TYPE: string; - LOAD_SEQ: number; - IS_FIRST: string; - NEED_CUTTING: string; - REMARK: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + ORDER_NO: string; + ORDER_LINE: string; + SN: string; + ITEM_CODE: string; + QTY: number; + STATUS: number; + LOCATION_CODE: string; + ERP_WH: string; + ALLOC_QTY: number; + SOURCE_CODE: string; + SOURCE_ORDER: string; + SOURCE_LINE: string; + LINE_NO: string; + SEGMENT: string; + SMT_NO: string; + STATION_NO: string; + FEEDER_NO: string; + FEEDER_TYPE: string; + LOAD_SEQ: number; + IS_FIRST: string; + NEED_CUTTING: string; + REMARK: string; } //鍏朵粬鍑哄簱鍗曞疄浣� export type OtheroutorderParams = { @@ -400,29 +400,29 @@ export type OtheroutorderDetailPageParams = BasicPageParams & OtheroutorderDetailParams; export interface OtheroutorderDetailListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - BILLCODE: string; - BILLLINE: string; - LINESTATUS: string; - ITEM_CODE: string; - UNITCODE: string; - PRQTY: number; - QTY: number; - OWE_QTY: number; - DELIVERYDATE: string; - WAREHOUSECODE: string; - SOURCETYPE: number; - SOURCECODE: string; - SOURCELINE: string; - REMARK: string; - ERP_BILL_CODE: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + BILLCODE: string; + BILLLINE: string; + LINESTATUS: string; + ITEM_CODE: string; + UNITCODE: string; + PRQTY: number; + QTY: number; + OWE_QTY: number; + DELIVERYDATE: string; + WAREHOUSECODE: string; + SOURCETYPE: number; + SOURCECODE: string; + SOURCELINE: string; + REMARK: string; + ERP_BILL_CODE: string; } //鍏朵粬鍑哄簱鍗曞疄浣撴潯鐮佹槑缁� export type OtheroutorderDetailSNParams = { @@ -434,36 +434,36 @@ export type OtheroutorderDetailSNPageParams = BasicPageParams & OtheroutorderDetailSNParams; export interface OtheroutorderDetailSNListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - ORDER_NO: string; - ORDER_LINE: string; - SN: string; - ITEM_CODE: string; - QTY: number; - STATUS: number; - LOCATION_CODE: string; - ERP_WH: string; - ALLOC_QTY: number; - SOURCE_CODE: string; - SOURCE_ORDER: string; - SOURCE_LINE: string; - LINE_NO: string; - SEGMENT: string; - SMT_NO: string; - STATION_NO: string; - FEEDER_NO: string; - FEEDER_TYPE: string; - LOAD_SEQ: number; - IS_FIRST: string; - NEED_CUTTING: string; - REMARK: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + ORDER_NO: string; + ORDER_LINE: string; + SN: string; + ITEM_CODE: string; + QTY: number; + STATUS: number; + LOCATION_CODE: string; + ERP_WH: string; + ALLOC_QTY: number; + SOURCE_CODE: string; + SOURCE_ORDER: string; + SOURCE_LINE: string; + LINE_NO: string; + SEGMENT: string; + SMT_NO: string; + STATION_NO: string; + FEEDER_NO: string; + FEEDER_TYPE: string; + LOAD_SEQ: number; + IS_FIRST: string; + NEED_CUTTING: string; + REMARK: string; } //閿�鍞��璐у崟瀹炰綋 export type SalebackorderParams = { @@ -502,33 +502,33 @@ export type SalebackorderDetailPageParams = BasicPageParams & SalebackorderDetailParams; export interface SalebackorderDetailListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - BILLCODE: string; - BILLLINE: string; - LINESTATUS: string; - ITEM_CODE: string; - UNITCODE: string; - PRQTY: number; - INVENTORYQTY: number; - GOODQTY: number; - NGQTY: number; - SCRAPQTY: number; - GOODINSTOCKQTY: number; - NGINSTOCKQTY: number; - SCRAPINSTCOKQTY: number; - WAREHOUSECODE: string; - SOURCETYPE: number; - SOURCECODE: string; - SOURCELINE: number; - REMARK: string; - ERP_BILL_CODE: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + BILLCODE: string; + BILLLINE: string; + LINESTATUS: string; + ITEM_CODE: string; + UNITCODE: string; + PRQTY: number; + INVENTORYQTY: number; + GOODQTY: number; + NGQTY: number; + SCRAPQTY: number; + GOODINSTOCKQTY: number; + NGINSTOCKQTY: number; + SCRAPINSTCOKQTY: number; + WAREHOUSECODE: string; + SOURCETYPE: number; + SOURCECODE: string; + SOURCELINE: number; + REMARK: string; + ERP_BILL_CODE: string; } //閿�鍞��璐у崟瀹炰綋鏉$爜鏄庣粏 export type SalebackorderDetailSNParams = { @@ -539,19 +539,19 @@ export type SalebackorderDetailSNPageParams = BasicPageParams & SalebackorderDetailSNParams; export interface SalebackorderDetailSNListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - SN: string; - ITEM_CODE: string; - QTY: number; - BUSINESSCODE: string; - BUSINESSLINE: number; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + SN: string; + ITEM_CODE: string; + QTY: number; + BUSINESSCODE: string; + BUSINESSLINE: number; } //閫佹鍗曞疄浣� export type InspectionParams = { @@ -834,22 +834,22 @@ }; export type TransferdtlsnPageParams = BasicPageParams & TransferdtlsnParams; export interface TransferDetailSNListItem { - ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - SN: string; - ITEM_CODE: string; - QTY: number; - BILLCODE: string; - BILLDATE: Date; - BILLLINE: string; - LINESTATUS: string; + ID: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + SN: string; + ITEM_CODE: string; + QTY: number; + BILLCODE: string; + BILLDATE: Date; + BILLLINE: string; + LINESTATUS: string; } // 瀹屽伐鍏ュ簱鍗曞疄浣� export type FinishedwarehouseParams = { @@ -888,55 +888,55 @@ export type FinishedwarehouseDetailPageParams = BasicPageParams & FinishedwarehouseDetailParams; export interface FinishedwarehouseDetailListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - BILLCODE: string; - BILLLINE: string; - LINESTATUS: string; - ITEM_CODE: string; - UNITCODE: string; - PRQTY: number; - INVENTORYQTY: number; - INSTOCKQTY: number; - WAREHOUSECODE: string; - SOURCETYPE: number; - SOURCECODE: string; - SOURCELINE: string; - REMARK: string; - ERP_BILL_CODE: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + BILLCODE: string; + BILLLINE: string; + LINESTATUS: string; + ITEM_CODE: string; + UNITCODE: string; + PRQTY: number; + INVENTORYQTY: number; + INSTOCKQTY: number; + WAREHOUSECODE: string; + SOURCETYPE: number; + SOURCECODE: string; + SOURCELINE: string; + REMARK: string; + ERP_BILL_CODE: string; } // 瀹屽伐鍏ュ簱鍗曟潯鐮佹槑缁� export type FinishedwarehouseDetailSNParams = { - BUSINESSCODE?:string; + BUSINESSCODE?: string; ITEM_CODE?: string; SN?: string; }; export type FinishedwarehouseDetailSNPageParams = BasicPageParams & FinishedwarehouseDetailSNParams; export interface FinishedwarehouseDetailSNListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - CARTONNO: string; - BUSINESSCODE: string; - BUSINESSLINE: string; - SOURCECODE: string; - ITEM_CODE: string; - Qty: number; - SN: string; - PALLETNO: string; - DATECODE: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + CARTONNO: string; + BUSINESSCODE: string; + BUSINESSLINE: string; + SOURCECODE: string; + ITEM_CODE: string; + Qty: number; + SN: string; + PALLETNO: string; + DATECODE: string; } // 閫佽揣鍗曞疄浣� export type DeliveryParams = { @@ -989,47 +989,47 @@ export type DeliveryDetailPageParams = BasicPageParams & DeliveryDetailParams; export interface DeliveryDetailListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - DELIVERY_NO: string; - LINE_NO: number; - ERP_PO_NO: string; - PO_LINE_NO: number; - PO_TYPE: number; - ITEM_CODE: string; - ITEM_NAME: string; - SPECIFICATION: string; - QTY: number; - UNIT: string; - VALUATION_QTY: number; - PRICE: number; - TAX_PRICE: number; - STATUS: number; - RECEIVE_STATUS: number; - BUYER: string; - EXPECTED_DATE: string; - ANSWER_DATE: string; - CURRENCY_CODE: string; - CURRENCY_NAME: string; - VERIFY_STATUS: number; - VERIFY_RESULT: number; - REMARK: string; - BRAND_NAME: string; - BATCH_NUMBER: string; - UNIT_NAME: string; - PACKING_QTY: number; - APPLY_DELIVERY_QTY: number; - GROSS_WEIGHT: number; - NET_WEIGHT: number; - UNIT_WEIGHTCODE: string; - UNIT_WEIGHTNAME: string; - URGENT_FLAG: number; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + DELIVERY_NO: string; + LINE_NO: number; + ERP_PO_NO: string; + PO_LINE_NO: number; + PO_TYPE: number; + ITEM_CODE: string; + ITEM_NAME: string; + SPECIFICATION: string; + QTY: number; + UNIT: string; + VALUATION_QTY: number; + PRICE: number; + TAX_PRICE: number; + STATUS: number; + RECEIVE_STATUS: number; + BUYER: string; + EXPECTED_DATE: string; + ANSWER_DATE: string; + CURRENCY_CODE: string; + CURRENCY_NAME: string; + VERIFY_STATUS: number; + VERIFY_RESULT: number; + REMARK: string; + BRAND_NAME: string; + BATCH_NUMBER: string; + UNIT_NAME: string; + PACKING_QTY: number; + APPLY_DELIVERY_QTY: number; + GROSS_WEIGHT: number; + NET_WEIGHT: number; + UNIT_WEIGHTCODE: string; + UNIT_WEIGHTNAME: string; + URGENT_FLAG: number; } // 閫佽揣鍗曞疄浣撴潯鐮佹槑缁� export type DeliveryDetailSNParams = { @@ -1041,32 +1041,32 @@ export type DeliveryDetailSNPageParams = BasicPageParams & DeliveryDetailSNParams; export interface DeliveryDetailSNListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - DELIVERY_NO: string; - ITEM_CODE: string; - ITEM_NAME: string; - SPECIFICATION: string; - QTY: number; - SMALL_BARCODE: string; - BIG_BARCODE: string; - OUTER_BARCODE: string; - SMALL_SN: string; - BIG_SN: string; - OUTER_SN: string; - SUPP_CODE: string; - PROD_DATE: string; - REMARK: string; - IMPORTED: number; - IMPORTED_DATE: string; - PO_ERP_NO: string; - PO_LINE_NO: number; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + DELIVERY_NO: string; + ITEM_CODE: string; + ITEM_NAME: string; + SPECIFICATION: string; + QTY: number; + SMALL_BARCODE: string; + BIG_BARCODE: string; + OUTER_BARCODE: string; + SMALL_SN: string; + BIG_SN: string; + OUTER_SN: string; + SUPP_CODE: string; + PROD_DATE: string; + REMARK: string; + IMPORTED: number; + IMPORTED_DATE: string; + PO_ERP_NO: string; + PO_LINE_NO: number; } //鍒拌揣鍗曞疄浣� export type EnterWarehouseParams = { @@ -1098,7 +1098,7 @@ //鍒拌揣鍗曟槑缁嗗疄浣� export type EnterWarehouseDetailParams = { BILLCODE?: string; - ITEM_CODE?:string; + ITEM_CODE?: string; BILLDATE?: string; STATUS?: string; //ERP_BILL_CODE?: string; @@ -1107,30 +1107,30 @@ export type EnterWarehouseDetailPageParams = BasicPageParams & EnterWarehouseDetailParams; export interface EnterWarehouseDetailListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - BILLCODE: string; - BILLDATE: string; - STATUS: number; - BIZTYPE: number; - SUPPLIERCODE: string; - REMARK: string; - ERP_BILL_CODE: string; - ERP_TRANS_CODE: string; - HANDLED: number; - HANDLED_DATE: Date; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + BILLCODE: string; + BILLDATE: string; + STATUS: number; + BIZTYPE: number; + SUPPLIERCODE: string; + REMARK: string; + ERP_BILL_CODE: string; + ERP_TRANS_CODE: string; + HANDLED: number; + HANDLED_DATE: Date; } //鍒拌揣鍗曟潯鐮佹槑缁嗗疄浣� export type EnterWarehouseDetailSNParams = { BILLCODE?: string; - ITEM_CODE?:string; - SN?:string; + ITEM_CODE?: string; + SN?: string; STATUS?: string; //ERP_BILL_CODE?: string; BIZTYPE: string; @@ -1138,32 +1138,32 @@ export type EnterWarehouseDetailSNPageParams = BasicPageParams & EnterWarehouseDetailSNParams; export interface EnterWarehouseDetailSNListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - BILLCODE: string; - BILLLINE: string; - SOURCETYPE: number; - ITEM_CODE: string; - SN: string; - SUPPLIERCODE: string; - DATECODE: string; - SCANQTY: number; - UNIT: string; - ISGIVEAWAY: number; - DELIVERY_NO: string; - DELIVERY_LINE: number; - REMARK: string; - LOTNO: string; - STATEFLAG: string; - CARTON: string; - PALLET: string; - SCAN_SN: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + BILLCODE: string; + BILLLINE: string; + SOURCETYPE: number; + ITEM_CODE: string; + SN: string; + SUPPLIERCODE: string; + DATECODE: string; + SCANQTY: number; + UNIT: string; + ISGIVEAWAY: number; + DELIVERY_NO: string; + DELIVERY_LINE: number; + REMARK: string; + LOTNO: string; + STATEFLAG: string; + CARTON: string; + PALLET: string; + SCAN_SN: string; } // 鍏朵粬鍏ュ簱鍗曞疄浣� export type OtherwarehouseParams = { @@ -1204,28 +1204,28 @@ export type OtherdwarehouseDetailPageParams = BasicPageParams & OtherwarehouseDetailParams; export interface OtherwarehouseDetailListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - BILLCODE: string; - BILLLINE: number; - LINESTATUS: string; - ITEM_CODE: string; - UNITCODE: string; - PRQTY: number; - QTY: number; - DELIVERYDATE: string; - WAREHOUSECODE: string; - SOURCETYPE: number; - SOURCECODE: string; - SOURCELINE: string; - REMARK: string; - ERP_BILL_CODE: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + BILLCODE: string; + BILLLINE: number; + LINESTATUS: string; + ITEM_CODE: string; + UNITCODE: string; + PRQTY: number; + QTY: number; + DELIVERYDATE: string; + WAREHOUSECODE: string; + SOURCETYPE: number; + SOURCECODE: string; + SOURCELINE: string; + REMARK: string; + ERP_BILL_CODE: string; } // 鍏朵粬鍏ュ簱鍗曞疄浣撴潯鐮佹槑缁� export type OtherwarehouseDetailSNParams = { @@ -1237,24 +1237,24 @@ export type OtherdwarehouseDetailSNPageParams = BasicPageParams & OtherwarehouseDetailSNParams; export interface OtherwarehouseDetailSNListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - SN: string; - ITEM_CODE: string; - QTY: number; - BUSINESSCODE: string; - BUSINESSLINE: string; - DATECODE: string; - DATECODESTR: string; - LOTNO: string; - STATUS: string; - WAREHOUSECODE: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + SN: string; + ITEM_CODE: string; + QTY: number; + BUSINESSCODE: string; + BUSINESSLINE: string; + DATECODE: string; + DATECODESTR: string; + LOTNO: string; + STATUS: string; + WAREHOUSECODE: string; } //鐢熶骇閫�鏂欏崟 export type MaterialRetParams = { @@ -1292,57 +1292,57 @@ export type MaterialRetDetailPageParams = BasicPageParams & MaterialRetDetailParams; export interface MaterialRetDetailListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - BILLCODE: string; - BILLLINE: number; - LINESTATUS: string; - ITEM_CODE: string; - UNITCODE: string; - PRQTY: number; - WAREHOUSECODE: string; - SOURCETYPE: number; - SOURCECODE: string; - SOURCELINE: number; - REMARK: string; - GOODQTY: number; - NGQTY: number; - GOODINSTOCKQTY: number; - NgINSTOCKQTY: number; - SCRAPQTY: number; - SCRAPINSTCOKQTY: number; - INVENTORYQTY: number; - ERP_BILL_CODE: string; - DELIVERYDATE: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + BILLCODE: string; + BILLLINE: number; + LINESTATUS: string; + ITEM_CODE: string; + UNITCODE: string; + PRQTY: number; + WAREHOUSECODE: string; + SOURCETYPE: number; + SOURCECODE: string; + SOURCELINE: number; + REMARK: string; + GOODQTY: number; + NGQTY: number; + GOODINSTOCKQTY: number; + NgINSTOCKQTY: number; + SCRAPQTY: number; + SCRAPINSTCOKQTY: number; + INVENTORYQTY: number; + ERP_BILL_CODE: string; + DELIVERYDATE: string; } //鐢熶骇閫�鏂欏崟鏉$爜 export type MaterialRetDetailSNParams = { BILLCODE?: string; - ITEM_CODE?:string; - SN?:string; + ITEM_CODE?: string; + SN?: string; }; export type MaterialRetDetailSNPageParams = BasicPageParams & MaterialRetDetailSNParams; export interface MaterialRetDetailSNListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - ITEM_CODE: string; - SN: string; - QTY: number; - BUSINESSCODE: string; - BUSINESSLINE: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + ITEM_CODE: string; + SN: string; + QTY: number; + BUSINESSCODE: string; + BUSINESSLINE: string; } //閲囪喘鍗� export type PurchaseParams = { @@ -1382,38 +1382,38 @@ export type PurchasePageDetailParams = BasicPageParams & PurchaseDetailParams; export interface PurchaseDetailListItem { ID: string; - CREATE_TIME: string; - CREATE_USER: string; - UPDATE_TIME: string; - UPDATE_USER: string; - GHOST_ROW: boolean; - AUTH_ORG: string; - AUTH_PROD: string; - AUTH_WH: string; - BILLID: string; - BILLCODE: string; - BILLLINE: string; - MATERIALCODE: string; - UNITCODE: string; - LINESTATUS: number; - PRQTY: number; - QTY: number; - ARRIVALQTY: number; - INSTOCKQTY: number; - RETURNQTY: number; - ISGIVEAWAY: number; - TAXRATE: number; - PRICE: number; - TAXPRICE: number; - AMOUNT: number; - ALLAMOUNT: number; - TAXAMOUNT: number; - DISCOUNTRATE: number; - DISCOUNT: number; - SUPPLIERMATERIALCODE: string; - DELIVERYDATE: string; - PROMISEDATE: string; - REMARK: string; + CREATE_TIME: string; + CREATE_USER: string; + UPDATE_TIME: string; + UPDATE_USER: string; + GHOST_ROW: boolean; + AUTH_ORG: string; + AUTH_PROD: string; + AUTH_WH: string; + BILLID: string; + BILLCODE: string; + BILLLINE: string; + MATERIALCODE: string; + UNITCODE: string; + LINESTATUS: number; + PRQTY: number; + QTY: number; + ARRIVALQTY: number; + INSTOCKQTY: number; + RETURNQTY: number; + ISGIVEAWAY: number; + TAXRATE: number; + PRICE: number; + TAXPRICE: number; + AMOUNT: number; + ALLAMOUNT: number; + TAXAMOUNT: number; + DISCOUNTRATE: number; + DISCOUNT: number; + SUPPLIERMATERIALCODE: string; + DELIVERYDATE: string; + PROMISEDATE: string; + REMARK: string; } // 瀹炴椂搴撳瓨瀹炰綋 export type WmsItemParams = { @@ -1509,12 +1509,16 @@ export type FactoryPageListGetResultModel = BasicFetchResult<FactoryListItem>; //瀹屽伐鍏ュ簱鍗� export type FinishedwarehousePageListGetResultModel = BasicFetchResult<FinishedwarehouseListItem>; -export type FinishedwarehouseDetailPageListGetResultModel = BasicFetchResult<FinishedwarehouseDetailListItem>; -export type FinishedwarehousePageDetailSNListGetResultModel = BasicFetchResult<FinishedwarehouseDetailSNListItem>; +export type FinishedwarehouseDetailPageListGetResultModel = + BasicFetchResult<FinishedwarehouseDetailListItem>; +export type FinishedwarehousePageDetailSNListGetResultModel = + BasicFetchResult<FinishedwarehouseDetailSNListItem>; export type OhterwarehousePageListGetResultModel = BasicFetchResult<OtherwarehouseListItem>; -export type OhterwarehouseDetailPageListGetResultModel = BasicFetchResult<OtherwarehouseDetailListItem>; -export type OhterwarehouseDetailSNPageListGetResultModel = BasicFetchResult<OtherwarehouseDetailSNListItem>; +export type OhterwarehouseDetailPageListGetResultModel = + BasicFetchResult<OtherwarehouseDetailListItem>; +export type OhterwarehouseDetailSNPageListGetResultModel = + BasicFetchResult<OtherwarehouseDetailSNListItem>; //閫佽揣鍗� export type DeliveryePageListGetResultModel = BasicFetchResult<DeliveryListItem>; export type DeliveryeDetailPageListGetResultModel = BasicFetchResult<DeliveryDetailListItem>; @@ -1525,15 +1529,20 @@ //閿�鍞嚭搴撳崟 export type SaleoutorderPageListGetResultModel = BasicFetchResult<SaleoutorderListItem>; export type SaleoutorderDetailPageListGetResultModel = BasicFetchResult<SaleoutorderDetailListItem>; -export type SaleoutorderDetailSNPageListGetResultModel = BasicFetchResult<SaleoutorderDetailSNListItem>; +export type SaleoutorderDetailSNPageListGetResultModel = + BasicFetchResult<SaleoutorderDetailSNListItem>; //鍏朵粬鍑哄簱鍗� export type OtheroutorderPageListGetResultModel = BasicFetchResult<OtheroutorderListItem>; -export type OtheroutorderDetailPageListGetResultModel = BasicFetchResult<OtheroutorderDetailListItem>; -export type OtheroutorderPageDetailSNListGetResultModel = BasicFetchResult<OtheroutorderDetailSNListItem>; +export type OtheroutorderDetailPageListGetResultModel = + BasicFetchResult<OtheroutorderDetailListItem>; +export type OtheroutorderPageDetailSNListGetResultModel = + BasicFetchResult<OtheroutorderDetailSNListItem>; //閿�鍞��璐у崟 export type SalebackorderPageListGetResultModel = BasicFetchResult<SalebackorderListItem>; -export type SalebackorderPageDetailListGetResultModel = BasicFetchResult<SalebackorderDetailListItem>; -export type SalebackorderPageDetailSNListGetResultModel = BasicFetchResult<SalebackorderDetailSNListItem>; +export type SalebackorderPageDetailListGetResultModel = + BasicFetchResult<SalebackorderDetailListItem>; +export type SalebackorderPageDetailSNListGetResultModel = + BasicFetchResult<SalebackorderDetailSNListItem>; export type InventoryPageListGetResultModel = BasicFetchResult<InventoryListItem>; export type WmsItemPageListGetResultModel = BasicFetchResult<WmsItemListItem>; @@ -1541,19 +1550,22 @@ //棰嗘枡鍗� export type MaterialReqPageListGetResultModel = BasicFetchResult<MaterialReqListItem>; export type MaterialReqDetailPageListGetResultModel = BasicFetchResult<MaterialReqDetailListItem>; -export type MaterialReqDetailSNPageListGetResultModel = BasicFetchResult<MaterialReqDetailSNListItem>; +export type MaterialReqDetailSNPageListGetResultModel = + BasicFetchResult<MaterialReqDetailSNListItem>; //鐢熶骇閫�鏂欏崟 export type MaterialRetPageListGetResultModel = BasicFetchResult<MaterialRetListItem>; export type MaterialRetDetailPageListGetResultModel = BasicFetchResult<MaterialRetDetailListItem>; -export type MaterialRetDetailSNPageListGetResultModel = BasicFetchResult<MaterialRetDetailSNListItem>; +export type MaterialRetDetailSNPageListGetResultModel = + BasicFetchResult<MaterialRetDetailSNListItem>; //鍒拌揣鍗� export type EnterWarehousePageListGetResultModel = BasicFetchResult<EnterWarehouseListItem>; -export type EnterWarehouseDetailPageListGetResultModel = BasicFetchResult<EnterWarehouseDetailListItem>; -export type EnterWarehouseDetailSNPageListGetResultModel = BasicFetchResult<EnterWarehouseDetailSNListItem>; +export type EnterWarehouseDetailPageListGetResultModel = + BasicFetchResult<EnterWarehouseDetailListItem>; +export type EnterWarehouseDetailSNPageListGetResultModel = + BasicFetchResult<EnterWarehouseDetailSNListItem>; //璋冩嫧鍗� export type TransferPageListGetResultModel = BasicFetchResult<TransferListItem>; export type TransferDetailPageListGetResultModel = BasicFetchResult<TransferDetailListItem>; export type TransferDetailSNPageListGetResultModel = BasicFetchResult<TransferDetailSNListItem>; // 鍖呰瑙勫垯 // export type PackagerPageListGetResultModel = BasicFetchResult<PackagerItemListItem>; - diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts index b92ba55..522a901 100644 --- a/src/api/tigerapi/system.ts +++ b/src/api/tigerapi/system.ts @@ -27,6 +27,7 @@ iSYS_ROLE_WH, } from './model/systemModel'; import { defHttp } from '/@/utils/http/axios'; +import { isNullOrEmpty } from '/@/utils/is'; export enum Api { QueryUrl = '/Base/Query', @@ -629,6 +630,10 @@ return model; } +/* + *閫氱敤鏂规硶======================================================== + */ + export const GetEnum = async (enumName: { name: string }) => { const usParams = genAction(enumName.name, ''); return await defHttp.post( @@ -640,3 +645,34 @@ }, ); }; + +export async function getListByPage<T>(params: T) { + const Keys = Object.getOwnPropertyNames(params); + let sqlcmd = ''; + for (const k in Keys) { + console.log(`${k}:${Keys[k]}`); + if ( + !isNullOrEmpty(params[Keys[k]]) && + Keys[k] != 'page' && + Keys[k] != 'pageSize' && + Keys[k] != 'TABLE_NAME' + ) { + sqlcmd += `And ${Keys[k]} like '%${params[Keys[k]]}%'`; + } + } + const rParams = genActionPage(params['TABLE_NAME'], sqlcmd, params['page'], params['pageSize']); + return getListByPageAsync(rParams); +} +async function getListByPageAsync(params: ApiActionPage) { + const data = await defHttp.post<ApiActionPage>( + { url: Api.EntityPageList, params }, + { + isTransformResponse: false, + }, + ); + const model = { + items: data.Data.data, + total: data.Data.totals, + }; + return model; +} diff --git a/src/api/tigerapi/wms/region.ts b/src/api/tigerapi/wms/region.ts index 3902d7a..a2bc1a1 100644 --- a/src/api/tigerapi/wms/region.ts +++ b/src/api/tigerapi/wms/region.ts @@ -1,40 +1,7 @@ import { buildUUID } from '../../../utils/uuid'; -import { ApiActionPage } from '../../model/baseModel'; -import { - RegionListItem, - RegionPageParams, - RegionPageListGetResultModel, -} from '../model/warehoueseModel'; -import { genAction, Api, genActionPage } from '../system'; +import { RegionListItem } from '../model/warehoueseModel'; +import { genAction, Api } from '../system'; import { defHttp } from '/@/utils/http/axios'; - -/* - * 鑾峰彇鍖哄煙鍒嗛〉鍒楄〃 - */ -export const getRegionListByPage = async (params: RegionPageParams) => { - let sqlcmd = ''; - if (params?.REGION_CODE != undefined && params?.REGION_CODE != '') { - sqlcmd += "And REGION_CODE like '%" + params?.REGION_CODE + "%'"; - } - if (params?.REGION_NAME != undefined && params?.REGION_NAME != '') { - sqlcmd += "And REGION_NAME = '" + params?.REGION_NAME + "'"; - } - const rParams = genActionPage('WMS_REGION', sqlcmd, params.page, params.pageSize); - return getRegionListByPageAsync(rParams); -}; -async function getRegionListByPageAsync(params: ApiActionPage) { - const data = await defHttp.post<ApiActionPage>( - { url: Api.EntityPageList, params }, - { - isTransformResponse: false, - }, - ); - const model: RegionPageListGetResultModel = { - items: data.Data.data, - total: data.Data.totals, - }; - return model; -} export const SaveRegion = async (params: RegionListItem, isUpdate: boolean) => { let data; @@ -68,4 +35,4 @@ isTransformResponse: false, }, ); -}; \ No newline at end of file +}; diff --git a/src/views/tigerprojects/mes/prod/biz_mes_wo/biz_mes_wo.data.ts b/src/views/tigerprojects/mes/prod/biz_mes_wo/biz_mes_wo.data.ts index cb8d233..f46a04d 100644 --- a/src/views/tigerprojects/mes/prod/biz_mes_wo/biz_mes_wo.data.ts +++ b/src/views/tigerprojects/mes/prod/biz_mes_wo/biz_mes_wo.data.ts @@ -3,7 +3,6 @@ import { h, unref } from 'vue'; import { Tag, Tooltip } from 'ant-design-vue'; import { useLocale } from '/@/locales/useLocale'; -import { MesWoStatus } from '/@/api/tigerapi/mes/wo'; import { useI18n } from '/@/hooks/web/useI18n'; import { GetEnum } from '/@/api/tigerapi/system'; @@ -289,6 +288,14 @@ span: 4, }, }, + { + field: 'TABLE_NAME', + label: '琛ㄥ悕', + component: 'Input', + colProps: { span: 8 }, + defaultValue: 'BIZ_MES_WO', + ifShow: false, + }, ]; //鏂板缁勪欢export const diff --git a/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue b/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue index 8c73601..1f50b61 100644 --- a/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue +++ b/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue @@ -66,18 +66,19 @@ </div> </template> <script lang="ts" setup> - import { reactive, unref, h } from 'vue'; + import { reactive, unref, h, onMounted } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import WoDrawer from './WoDrawer.vue'; import WoModal from './WoModal.vue'; import ItemModal from '/@/views/components/ItemModal.vue'; import { useDrawer } from '/@/components/Drawer'; import { columns, searchFormSchema } from './biz_mes_wo.data'; - import { DeleteMesWo, getWoListByPage } from '/@/api/tigerapi/mes/wo'; + import { DeleteMesWo } from '/@/api/tigerapi/mes/wo'; import { Loading } from '/@/components/Loading'; import { useMessage } from '/@/hooks/web/useMessage'; import { useI18n } from '/@/hooks/web/useI18n'; import { useModal } from '/@/components/Modal'; + import { getListByPage } from '/@/api/tigerapi/system'; const { t } = useI18n(); const { createMessage } = useMessage(); @@ -91,7 +92,7 @@ const [registerItemAdd, { openModal: openItemModal }] = useModal(); const [registerTable, { getForm, reload }] = useTable({ title: '宸ュ崟淇℃伅', - api: getWoListByPage, + api: getListByPage, columns, formConfig: { labelWidth: 120, @@ -111,6 +112,8 @@ showIndexColumn: false, }); + onMounted(() => {}); + //鏂板 function addWo() { openDrawer(true, { diff --git a/src/views/tigerprojects/wms/region/index.vue b/src/views/tigerprojects/wms/region/index.vue index 2bb6c5b..05fd2ed 100644 --- a/src/views/tigerprojects/wms/region/index.vue +++ b/src/views/tigerprojects/wms/region/index.vue @@ -36,7 +36,8 @@ import RegionDrawer from './regionDrawer.vue'; import { columns, searchFormSchema } from './region.data'; - import { DeleteRegion, getRegionListByPage } from '/@/api/tigerapi/wms/region'; + import { DeleteRegion } from '/@/api/tigerapi/wms/region'; + import { getListByPage } from '/@/api/tigerapi/system'; export default defineComponent({ name: 'LocationManagement', @@ -45,7 +46,7 @@ const [registerDrawer, { openDrawer }] = useDrawer(); const [registerTable, { reload }] = useTable({ title: '鍌ㄥ尯鍒楄〃', - api: getRegionListByPage, + api: getListByPage, columns, formConfig: { labelWidth: 120, @@ -54,7 +55,7 @@ useSearchForm: true, showTableSetting: true, bordered: true, - canResize:true, + canResize: true, showIndexColumn: false, actionColumn: { width: 80, diff --git a/src/views/tigerprojects/wms/region/region.data.ts b/src/views/tigerprojects/wms/region/region.data.ts index ed97ac5..4e1a373 100644 --- a/src/views/tigerprojects/wms/region/region.data.ts +++ b/src/views/tigerprojects/wms/region/region.data.ts @@ -48,6 +48,14 @@ component: 'Input', colProps: { span: 8 }, }, + { + field: 'TABLE_NAME', + label: '琛ㄥ悕', + component: 'Input', + colProps: { span: 8 }, + defaultValue: 'WMS_REGION', + ifShow: false, + }, ]; export const formSchema: FormSchema[] = [ -- Gitblit v1.9.3