@kengic/uni 0.6.3-beta.1 → 0.6.3-beta.3

package/dist/api/WMS/Controllers/CommonController/GetLatestApkVersion.ts

@@ -14,14 +14,7 @@ export class GetLatestApkVersionQuery {}
  * @param option 请求选项.
  */
 export function GetLatestApkVersion(config?: IRequestConfig<GetLatestApkVersionQuery, {}>, option?: IRequestOptions): Promise<string> {
-    return httpClient().request(
-        {
-            method: GetLatestApkVersion.method,
-            url: `${option?.mock ? '/mock' : ''}${GetLatestApkVersion.url}`,
-            ...(config ?? {}),
-        },
-        option,
-    );
+    return httpClient().request({ method: GetLatestApkVersion.method, url: GetLatestApkVersion.url, ...(config ?? {}) }, option);
 }
 
 GetLatestApkVersion.method = 'GET' as const;

package/dist/api/WMS/Controllers/LoginController/GetUserInfo.ts

@@ -14,14 +14,7 @@ export class GetUserInfoQuery {}
  * @param option 请求选项.
  */
 export function GetUserInfo(config?: IRequestConfig<GetUserInfoQuery, {}>, option?: IRequestOptions): Promise<Record<any, any>> {
-    return httpClient().request(
-        {
-            method: GetUserInfo.method,
-            url: `${option?.mock ? '/mock' : ''}${GetUserInfo.url}`,
-            ...(config ?? {}),
-        },
-        option,
-    );
+    return httpClient().request({ method: GetUserInfo.method, url: GetUserInfo.url, ...(config ?? {}) }, option);
 }
 
 GetUserInfo.method = 'GET' as const;

package/dist/api/WMS/Controllers/LoginController/Logout.ts

@@ -14,14 +14,7 @@ export class LogoutQuery {}
  * @param option 请求选项.
  */
 export function Logout(config?: IRequestConfig<LogoutQuery, {}>, option?: IRequestOptions): Promise<Record<any, any>> {
-    return httpClient().request(
-        {
-            method: Logout.method,
-            url: `${option?.mock ? '/mock' : ''}${Logout.url}`,
-            ...(config ?? {}),
-        },
-        option,
-    );
+    return httpClient().request({ method: Logout.method, url: Logout.url, ...(config ?? {}) }, option);
 }
 
 Logout.method = 'GET' as const;

package/dist/api/WMS/Controllers/WhController/ListVO.ts

@@ -81,14 +81,7 @@ wh-分页列表查询VO
  * @param option 请求选项.
  */
 export function ListVO(config?: IRequestConfig<ListVOQuery, {}>, option?: IRequestOptions): Promise<DEF.WMS.IPage<DEF.WMS.WhDTO>> {
-    return httpClient().request(
-        {
-            method: ListVO.method,
-            url: `${option?.mock ? '/mock' : ''}${ListVO.url}`,
-            ...(config ?? {}),
-        },
-        option,
-    );
+    return httpClient().request({ method: ListVO.method, url: ListVO.url, ...(config ?? {}) }, option);
 }
 
 ListVO.method = 'GET' as const;

package/dist/api/WMS/Controllers/WorkstationController/List.ts

@@ -0,0 +1,45 @@
+// noinspection ES6UnusedImports
+
+import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
+import * as DEF from '../../../def';
+import { keys } from '../../models';
+
+/** 请求参数. */
+export class ListQuery {
+    /** 排序字段. */
+    public column?: string | null;
+    /** 排序方式. */
+    public order?: 'asc' | 'desc' | null;
+    /** 当前页数. */
+    public pageNo?: number | null;
+    /** 每页条数. */
+    public pageSize?: number | null;
+
+    public constructor(obj?: ListQuery) {
+        keys(obj ?? {}).forEach((key: PropertyKey) => {
+            switch (key) {
+                case 'column':
+                case 'order':
+                case 'pageNo':
+                case 'pageSize':
+                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+}
+
+/**
+ * 工作站-分页列表查询
+ *
+ * @param config 请求配置.
+ * @param option 请求选项.
+ */
+export function List(config?: IRequestConfig<ListQuery, {}>, option?: IRequestOptions): Promise<DEF.WMS.IPage<DEF.WMS.WorkstationDTO>> {
+    return httpClient().request({ method: List.method, url: List.url, ...(config ?? {}) }, option);
+}
+
+List.method = 'GET' as const;
+List.url = '/workstation/workstation/list';

package/dist/api/WMS/Controllers/WorkstationController/index.ts

@@ -0,0 +1 @@
+export { List, ListQuery } from './List';

package/dist/api/WMS/Controllers/index.ts

@@ -1,3 +1,4 @@
 export * as CommonController from './CommonController';
 export * as LoginController from './LoginController';
 export * as WhController from './WhController';
+export * as WorkstationController from './WorkstationController';

package/dist/api/WMS/models.ts

@@ -222,6 +222,87 @@ export class WhDTO {
     }
 }
 
+/** 工作站区域数据传输对象 */
+export class WorkstationAreaDTO {
+    /** 主键 */
+    public id?: string | null;
+    /** 创建日期 */
+    public insDt?: string | null;
+    /** 创建用户 */
+    public insUsrId?: string | null;
+    /** 修改日期 */
+    public modUsrId?: string | null;
+    /** 修改用户 */
+    public moddte?: string | null;
+    /** 仓库 */
+    public whId?: string | null;
+    /** 工作区 */
+    public wrkare?: string | null;
+    /** 工作区描述 */
+    public wrkareDsc?: string | null;
+
+    public constructor(obj?: WorkstationAreaDTO) {
+        keys(obj ?? {}).forEach((key: PropertyKey) => {
+            switch (key) {
+                case 'id':
+                case 'insDt':
+                case 'insUsrId':
+                case 'modUsrId':
+                case 'moddte':
+                case 'whId':
+                case 'wrkare':
+                case 'wrkareDsc':
+                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+}
+
+/** 工作站数据传输对象 */
+export class WorkstationDTO {
+    /** 工作站 */
+    public devcod?: string | null;
+    /** 主工作区 */
+    public hmewrkare?: string | null;
+    /** 主键 */
+    public id?: string | null;
+    /** 创建日期 */
+    public insDt?: string | null;
+    /** 创建用户 */
+    public insUsrId?: string | null;
+    /** 修改日期 */
+    public modUsrId?: string | null;
+    /** 修改用户 */
+    public moddte?: string | null;
+    /** 仓库 */
+    public whId?: string | null;
+    /** 工作站与工作区域关系 */
+    public workstationAreas?: Array<WorkstationAreaDTO> | null;
+
+    public constructor(obj?: WorkstationDTO) {
+        keys(obj ?? {}).forEach((key: PropertyKey) => {
+            switch (key) {
+                case 'devcod':
+                case 'hmewrkare':
+                case 'id':
+                case 'insDt':
+                case 'insUsrId':
+                case 'modUsrId':
+                case 'moddte':
+                case 'whId':
+                case 'workstationAreas':
+                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+}
+
 /**
  * 获取对象的属性名数组.
  * @param obj 对象.

package/dist/component/KgStation/KgStation.vue

@@ -21,7 +21,8 @@
     import { UniDataSelect, UniPopup, UniPopupDialog } from '../../uni';
     import { computed, ref, watch } from 'vue';
     import { useKgStation } from './index.hooks';
-    import { WorkstationDTO } from './index.store';
+    import { WorkstationDTO } from '../../api/WMS/models';
+    import { API } from '../../api';
 
     const emit = defineEmits(['ok']);
 
@@ -43,9 +44,7 @@
     /**
      * 工作站下拉列表.
      */
-    const stationDatas = computed<Array<{ value: string; text: string }>>(() =>
-        stations.value.map((i) => ({ text: i.devcodDsc ?? '', value: i.devcod ?? '' })),
-    );
+    const stationDatas = computed<Array<{ value: string; text: string }>>(() => stations.value.map((i) => ({ text: i.devcod ?? '', value: i.devcod ?? '' })));
 
     /**
      * 工作区下拉列表.
@@ -55,8 +54,8 @@
             stations.value
                 .find((i) => i.devcod === currentDevcod.value)
                 ?.workstationAreas?.map((i) => ({
-                    text: i.wrkare ?? '',
-                    value: i.wrkareDsc ?? '',
+                    text: i.wrkareDsc ?? i.wrkare ?? '',
+                    value: i.wrkare ?? '',
                 })) ?? [],
     );
 
@@ -70,10 +69,12 @@
         if (!value) {
             currentHmewrkare.value = '';
         } else {
+            console.log('11', value, currentDevcod.value);
             // 当「当前选择的工作站编号」变更时, 选择它的默认的工作区,
             const currentStation = stations.value.find((i) => i.devcod === currentDevcod.value);
             if (currentStation) {
                 currentHmewrkare.value = currentStation.hmewrkare ?? '';
+                console.log('22', currentHmewrkare.value);
             }
         }
     });
@@ -120,29 +121,7 @@
      */
     async function requestStations(): Promise<void> {
         try {
-            // TODO 调用接口获取所有工作站
-            stations.value = [
-                {
-                    whId: 'WMD1',
-                    devcod: 'AAA',
-                    devcodDsc: 'AAA',
-                    hmewrkare: 'A111',
-                    workstationAreas: [
-                        { wrkare: 'A111', wrkareDsc: 'A111' },
-                        { wrkare: 'A222', wrkareDsc: 'A222' },
-                    ],
-                },
-                {
-                    whId: 'WMD1',
-                    devcod: 'BBB',
-                    devcodDsc: 'BBB',
-                    hmewrkare: 'B222',
-                    workstationAreas: [
-                        { wrkare: 'B111', wrkareDsc: 'B111' },
-                        { wrkare: 'B222', wrkareDsc: 'B222' },
-                    ],
-                },
-            ];
+            stations.value = (await API.WMS.WorkstationController.List({ params: { pageNo: 1, pageSize: 999 } }))?.records ?? [];
         } catch (e) {
             console.error(e);
         }
@@ -176,7 +155,7 @@
     :deep(.uni-popup-dialog) .uni-dialog-content > .row {
         display: flex;
         align-items: center;
-        margin-bottom: 6px;
+        margin-bottom: 3px;
         width: 100%;
     }
 

package/dist/component/KgStation/index.hooks.ts

@@ -1,6 +1,7 @@
 import { computed, ComputedRef } from 'vue';
-import { IKgStationStore, useKgStationStore, WorkstationDTO, WorkstationAreaDTO } from './index.store';
+import { IKgStationStore, useKgStationStore } from './index.store';
 import { useKgWarehouse } from '../KgWarehouse';
+import { WorkstationAreaDTO, WorkstationDTO } from '../../api/WMS/models';
 
 export type IUseKgStation = {
     /**

package/dist/component/KgStation/index.store.ts

@@ -1,23 +1,10 @@
 import { defineStore, StoreDefinition } from 'pinia';
 import { toRaw, unref } from 'vue';
+import { API } from '../../api';
+import { WorkstationDTO } from '../../api/WMS/models';
 
 const LOCAL_STORAGE_KEY = 'KgStation.station';
 
-export type WorkstationDTO = {
-    id?: string;
-    whId?: string;
-    devcod?: string;
-    devcodDsc?: string;
-    hmewrkare?: string;
-    workstationAreas?: Array<WorkstationAreaDTO>;
-};
-
-export type WorkstationAreaDTO = {
-    id?: string;
-    whId?: string;
-    wrkare?: string;
-    wrkareDsc?: string;
-};
 export interface IKgStationState {
     /**
      * 当前工作站.
@@ -57,29 +44,7 @@ export const useKgStationStore = defineStore('KgStation', {
                 return;
             }
 
-            // TODO 调用接口获取所有工作站
-            this.stations = [
-                {
-                    whId: 'WMD1',
-                    devcod: 'AAA',
-                    devcodDsc: 'AAA',
-                    hmewrkare: 'A111',
-                    workstationAreas: [
-                        { wrkare: 'A111', wrkareDsc: 'A111' },
-                        { wrkare: 'A222', wrkareDsc: 'A222' },
-                    ],
-                },
-                {
-                    whId: 'WMD1',
-                    devcod: 'BBB',
-                    devcodDsc: 'BBB',
-                    hmewrkare: 'B222',
-                    workstationAreas: [
-                        { wrkare: 'B111', wrkareDsc: 'B111' },
-                        { wrkare: 'B222', wrkareDsc: 'B222' },
-                    ],
-                },
-            ];
+            this.stations = (await API.WMS.WorkstationController.List({ params: { pageNo: 1, pageSize: 999 } }))?.records ?? [];
         },
 
         setStation(station?: WorkstationDTO | null): void {

package/dist/index.css

@@ -6,6 +6,11 @@ uni-button {
     padding-bottom: 50px !important;
 }
 
+.uni-simple-toast__text {
+    padding: 6.5px 12px 9.5px 12px;
+    border-radius: 4px;
+}
+
 /* #ifdef H5 */
 
 .uni-nav-bar-text {

package/dist/service/http-client.ts

@@ -74,8 +74,10 @@ type IRequestOptions = Omit<UniApp.RequestOptions, 'url'> & {
     /** 是否处理请求结果. */
     isTransformResponse?: boolean;
 
-    /** 是否使用模拟数据. */
-    mock?: boolean;
+    /**
+     * <p>模拟数据. 如果不为 undefined 则不会发起请求, 而是直接返回该模拟数据.</p>
+     */
+    mock?: any;
 };
 
 /** 请求参数. */
@@ -143,6 +145,11 @@ const _httpClient: IHttpClient = {
         },
         options?: IRequestOptions,
     ) {
+        // 使用模拟数据, 直接返回模拟数据,
+        if (options?.mock !== undefined) {
+            return new Promise((resolve) => resolve(options?.mock));
+        }
+
         const { method, url, params, data } = config;
 
         return new Promise<T>((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/uni",
-    "version": "0.6.3-beta.1",
+    "version": "0.6.3-beta.3",
     "scripts": {
         "build": "npm run switch-node-version && rimraf dist && vue-tsc && vite build",
         "------ -------------------------------------------": "",
@@ -32,7 +32,7 @@
     "dependencies": {
         "@dcloudio/types": "~3.3.3",
         "@dcloudio/uni-app": "3.0.0-alpha-3080220230428001",
-        "@kengic/pont": "1.2.14",
+        "@kengic/pont": "1.2.15",
         "@types/lodash-es": "4.17.7",
         "@types/node": "18.16.3",
         "@types/semver": "7.3.13",