1
0
Prechádzať zdrojové kódy

鸿蒙工控智能仓储手动入库,界面逻辑修改,接口联调。

jiaxiaoqiang 10 mesiacov pred
rodič
commit
93f52e9864

+ 1 - 0
entry/src/main/ets/common/constants/CommonConstants.ets

@@ -23,6 +23,7 @@ export default class CommonConstants {
   static USER_AVATAR: string = ''
   static STATION_NANE: string = ''
   static STATION_ID: number
+  static STATION_CODE: string = ''
   static stationDictValue: string=''
   // 是否是退出登陆
   static LOGIN_OUT: boolean = false

+ 1 - 0
entry/src/main/ets/model/MaterialInformation.ets

@@ -30,6 +30,7 @@ export interface MaterialInformationList{
   houseNo?:string
   deptId?: string
   houseType?:string
+  unitDictLabel?:string
   //主键
   id?:string
   locationNo?: string

+ 2 - 0
entry/src/main/ets/model/UserInfo.ets

@@ -18,4 +18,6 @@ export default class UserInfo {
   maintainLoginStatus?: number;
   // 更新时间戳
   updateTime?: number;
+
+  stationCode?: string
 }

+ 2 - 0
entry/src/main/ets/pages/LoginPage.ets

@@ -368,6 +368,7 @@ struct LoginPage {
          //      stationId:CommonConstants.STATION_NANE as WorkstationInfo
          //    }
          //  })
+
           console.log("tesTag1"+'+++++++++++++++'+this.workstation.stationDictValue)
          if (this.loginName && this.loginName.length > 0 && this.password && this.password.length > 0) {
             await getToken(this.loginName, this.password, this.dept?.id ? this.dept.id : 0, this.workstation?.id ? this.workstation.id : '0').then(token =>{
@@ -382,6 +383,7 @@ struct LoginPage {
             CommonConstants.USER_ID = userInfo.id!
             CommonConstants.USER_NAME = userInfo.userName!
             CommonConstants.USER_AVATAR = userInfo.avatar!
+           CommonConstants.STATION_CODE = userInfo.stationCode!
             CommonConstants.STATION_NANE = this.workstation && this.workstation.name ? this.workstation.name : ''
             CommonConstants.STATION_ID = this.workstation && this.workstation.id ? Number.parseInt(this.workstation.id) : 0
             let user = await UserAuthModel.getByUserId(userInfo.id?userInfo.id:0)

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 676 - 573
entry/src/main/ets/view/ManualWarehousing.ets


+ 1 - 0
entry/src/main/ets/viewmodel/RequestParamModel.ets

@@ -5,6 +5,7 @@ import MaterialInfo from './MaterialInfo'
 import Orders from './Orders'
 
 export default class RequestParamModel {
+  stanCode?:string
   data?:InDataClass
   deviceNo?:string
   rgvNo?:string