Merge remote-tracking branch 'origin/master'

common/src/main/ets/db/BaseTable.ets

@@ -26,7 +26,7 @@ export default abstract class BaseTable<T> implements ITable {
    * 初始化数据库
    */
   private async initDb(): Promise<rdb.RdbStore> {
-    Logger.info(this, '初始化数据库，dbName=' + this.dbName + ',tableName=' + this.tableName);
+    Logger.info(this, '初始化数据库，[dbName=' + this.dbName + ',tableName=' + this.tableName + ']');
     let db = await rdb.getRdbStore(getContext(this), {
       name: this.dbName,
       securityLevel: rdb.SecurityLevel.S1
@@ -57,7 +57,7 @@ export default abstract class BaseTable<T> implements ITable {
   }
 
   bindToValuesBucket(bucket: ValuesBucket, item: T) {
-    Logger.info(this,"表结构数据>>" + JSON.stringify(this.getTableColumns()))
+    Logger.info(this, "表结构数据>>" + JSON.stringify(this.getTableColumns()))
     this.getTableColumns().forEach((col) => {
       bucket[col] = item[col]
     })

common/src/main/ets/db/DatabaseImpl.ets

@@ -16,7 +16,7 @@ export class DatabaseImpl implements IDatabase {
     return Globals.getOrCreate(this.dbName + '_' + tableClass.name, () => {
       let tableName = Reflect.getMetadata('TableName', tableClass)
       if (!tableName) {
-        throw new Error('table name is empty')
+        throw new Error('[数据库异常]|未设置数据库表名')
       }
       return new tableClass(this.dbName, tableName);
     });

common/src/main/ets/db/ITable.ets

@@ -13,7 +13,7 @@ export default interface ITable {
   getColumnId(): string
 
   /**
-   * 获取数据库表项
+   * 获取数据库表列
    */
   getTableColumns(): string[]
 

common/src/main/ets/db/SQLiteContext.ets

@@ -10,15 +10,15 @@ export class SQLiteContext {
 
 
   /**
-   * 传入数据库表类，获取对应的表对象，进行相应的增删改查操作
+   * 传入数据库表类，获取对应的表对象，进行相应操作
    * @param tableClass
    */
   static with<T extends BaseTable<any>>(tableClass: { new(dbName, tableName): T }): T {
     let dbName = Reflect.getMetadata('Database', tableClass)
     if (!dbName) {
-      throw new Error('table db is empty')
+      throw new Error('数据库为空')
     }
-    Logger.info(this, 'dbName=' + dbName)
+    Logger.info(this, '[数据库信息]|[dbName=' + dbName + ']')
     let database = Globals.getOrCreate(dbName, () => {
       return new DatabaseImpl(dbName);
     })

common/src/main/ets/db/dao/BzhxDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { Bzhx } from '../../entity/Bzhx';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+
+/**
+ * 物资号型数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'TAB_XTWH_JCSJ_BZHX' })
+export class BzhxDao extends BaseTable<Bzhx> {
+  toBean(cursor: relationalStore.ResultSet): Bzhx {
+    let info: Bzhx = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      pmdmten: cursor.getString(cursor.getColumnIndex('pmdmten')),
+      pmdmsix: cursor.getString(cursor.getColumnIndex('pmdmsix')),
+      wzpm: cursor.getString(cursor.getColumnIndex('wzpm')),
+      hxmc: cursor.getString(cursor.getColumnIndex('hxmc')),
+      xh: cursor.getLong(cursor.getColumnIndex('xh')),
+      pmguid: cursor.getString(cursor.getColumnIndex('pmguid')),
+      hxguid: cursor.getString(cursor.getColumnIndex('hxguid')),
+      hwzt: cursor.getString(cursor.getColumnIndex('hwzt')),
+      pmguid_old: cursor.getString(cursor.getColumnIndex('pmguid_old'))
+    }
+    return info;
+  }
+
+  getEntityId(item: Bzhx): ValueType {
+    return item.pmdmten;
+  }
+
+  getColumnId(): string {
+    return "pmdmten";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'pmdmten', 'pmdmsix', 'wzpm', 'hxmc', 'xh', 'pmguid', 'hxguid', 'hwzt', 'pmguid_old'];
+  }
+
+  getCreateTableSql(): string {
+    const bzhx_sql = `create table if not exists TAB_XTWH_JCSJ_BZHX(
+							"GUID" TEXT NOT NULL,
+							"PMDMTEN" TEXT NOT NULL PRIMARY KEY,
+							"PMDMSIX" TEXT NOT NULL,
+							"WZPM" TEXT NOT NULL,
+							"HXMC" TEXT NOT NULL,
+							"XH" INTEGER NOT NULL,
+							"PMGUID" TEXT NOT NULL,
+							"HXGUID" TEXT,
+							"PMGUID_OLD" TEXT,
+							"HWZT" TEXT
+						  )`;
+    return bzhx_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/DcInfoDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { DcInfo } from '../../entity/DcInfo';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+/**
+ * 导出记录数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'EXPORT_TABLE' })
+export class DcInfoDao extends BaseTable<DcInfo> {
+  toBean(cursor: relationalStore.ResultSet): DcInfo {
+    let info: DcInfo = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      filename: cursor.getString(cursor.getColumnIndex('filename')),
+      filetype: cursor.getString(cursor.getColumnIndex('filetype')),
+      size: cursor.getLong(cursor.getColumnIndex('size')),
+      time: cursor.getString(cursor.getColumnIndex('time'))
+    }
+    return info;
+  }
+
+  getEntityId(item: DcInfo): ValueType {
+    return item.guid;
+  }
+
+  getColumnId(): string {
+    return "guid";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'filename', 'filetype', 'size', 'time']
+  }
+
+  getCreateTableSql(): string {
+    const export_sql = `create table if not exists EXPORT_TABLE(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"FILENAME" INTEGER,
+							"FILETYPE" INTEGER,
+							"SIZE" INTEGER,
+							"TIME" TEXT
+						  )`;
+
+    return export_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/DrInfoDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { DrInfo } from '../../entity/DrInfo';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+/**
+ * 导入记录数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'IMPORT_DR_TABLE' })
+export class DrInfoDao extends BaseTable<DrInfo> {
+  toBean(cursor: relationalStore.ResultSet): DrInfo {
+    let info: DrInfo = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      filename: cursor.getString(cursor.getColumnIndex('filename')),
+      filetype: cursor.getString(cursor.getColumnIndex('filetype')),
+      size: cursor.getLong(cursor.getColumnIndex('size')),
+      time: cursor.getString(cursor.getColumnIndex('time'))
+    }
+    return info;
+  }
+
+  getEntityId(item: DrInfo): ValueType {
+    return item.guid;
+  }
+
+  getColumnId(): string {
+    return "guid";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'filename', 'filetype', 'size', 'time']
+  }
+
+  getCreateTableSql(): string {
+    const import_sql = `create table if not exists IMPORT_DR_TABLE(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"FILENAME" TEXT,
+							"FILETYPE" TEXT,
+							"SIZE" INTEGER,
+							"TIME" TEXT
+						  )`;
+
+    return import_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/DsRfidDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { DsRfid } from '../../entity/DsRfid';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+/**
+ * RFID点数数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'COUNT_TABLE' })
+export class DsRfidDao extends BaseTable<DsRfid> {
+  toBean(cursor: relationalStore.ResultSet): DsRfid {
+    let info: DsRfid = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      wzcrkguid: cursor.getString(cursor.getColumnIndex('wzcrkguid')),
+      pmdmcode: cursor.getString(cursor.getColumnIndex('pmdmcode')),
+      pmmc: cursor.getString(cursor.getColumnIndex('pmmc')),
+      pmdm: cursor.getString(cursor.getColumnIndex('pmdm')),
+      hxmc: cursor.getString(cursor.getColumnIndex('hxmc')),
+      xh: cursor.getString(cursor.getColumnIndex('xh')),
+      sl: cursor.getString(cursor.getColumnIndex('sl')),
+      hwh: cursor.getString(cursor.getColumnIndex('hwh')),
+      epc: cursor.getString(cursor.getColumnIndex('epc')),
+      subepc: cursor.getString(cursor.getColumnIndex('subepc'))
+    }
+    return info;
+  }
+
+  getEntityId(item: DsRfid): ValueType {
+    return item.guid;
+  }
+
+  getColumnId(): string {
+    return "guid";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'wzcrkguid', 'pmdmcode', 'pmmc', 'pmdm', 'hxmc', 'xh', 'sl', 'hwh', 'epc', 'subepc']
+  }
+
+  getCreateTableSql(): string {
+    const count_sql = `create table if not exists COUNT_TABLE(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"WZCRKGUID" TEXT,
+							"PMDMCODE" TEXT,
+							"PMMC" TEXT,
+							"PMDM" TEXT,
+							"HXMC" TEXT,
+							"XH" TEXT,
+							"SL" TEXT,
+							"HWH" TEXT,
+							"EPC" TEXT,
+							"SUBEPC" TEXT
+						  )`;
+    return count_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/DwInfoDao.ets

 import relationalStore from '@ohos.data.relationalStore';
 import { DwInfo } from '../../entity/DwInfo';
+import { Logger } from '../../utils/Logger';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { BaseSql } from '../sql/BaseSql';
 
 /**
  * 单位的数据层
@@ -50,4 +52,11 @@ export class DwInfoDao extends BaseTable<DwInfo> {
           )`;
     return dw_sql;
   }
+
+  /**
+   * 获取单位列表信息
+   */
+  async getDwList(): Promise<DwInfo[]> {
+    return this.query(this.getPredicates().orderByAsc('dwdm'), this.getTableColumns());
+  }
 }
\ No newline at end of file

common/src/main/ets/db/dao/GldwDao.ets

@@ -8,7 +8,6 @@ import { Table } from '../decorator/Decorators';
  */
 @Table({ db: 'db_wms_app', name: 'TAB_BZGL_KNZY_APP_BGDDW' })
 export class GldwDao extends BaseTable<Gldw> {
-
   toBean(cursor: relationalStore.ResultSet): Gldw {
     let info: Gldw = {
       guid: cursor.getString(cursor.getColumnIndex('GUID')),
@@ -47,4 +46,16 @@ export class GldwDao extends BaseTable<Gldw> {
         )`;
     return gldw_sql;
   }
+
+  /**
+   * 查询管理单位列表
+   */
+  getGldwList(dwmc: string): Promise<Gldw[]> {
+    let wp = this.getPredicates();
+    if (dwmc) {
+      wp.like('DWFH', dwmc)
+    }
+    wp.orderByAsc('DWDM');
+    return this.query(wp, this.getTableColumns());
+  }
 }
\ No newline at end of file

common/src/main/ets/db/dao/HwghDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { Hwgh } from '../../entity/Hwgh';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+
+/**
+ * 货位规划数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'HW_PROJECT_TABLE' })
+export class HwghDao extends BaseTable<Hwgh> {
+  toBean(cursor: relationalStore.ResultSet): Hwgh {
+    let info: Hwgh = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      hjguid: cursor.getString(cursor.getColumnIndex('hjguid')),
+      pmguid: cursor.getString(cursor.getColumnIndex('pmguid')),
+      hwguid: cursor.getString(cursor.getColumnIndex('hwguid'))
+    }
+    return info;
+  }
+
+  getEntityId(item: Hwgh): ValueType {
+    return item.guid;
+  }
+
+  getColumnId(): string {
+    return "guid";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'hjguid', 'pmguid', 'hwguid'];
+  }
+
+  getCreateTableSql(): string {
+    const hwgh_sql = `create table if not exists HW_PROJECT_TABLE(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"HJGUID" TEXT,
+							"PMGUID" TEXT,
+							"HWGUID" TEXT
+						  )`;
+    return hwgh_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/QyInfoDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { QyInfo } from '../../entity/QyInfo';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+/**
+ * 区域信息数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'TAB_BZGL_KNZY_APP_QYB' })
+export class QyInfoDao extends BaseTable<QyInfo> {
+  toBean(cursor: relationalStore.ResultSet): QyInfo {
+    let info: QyInfo = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      ckdwguid: cursor.getString(cursor.getColumnIndex('ckdwguid')),
+      kfdm: cursor.getString(cursor.getColumnIndex('kfdm')),
+      kfguid: cursor.getString(cursor.getColumnIndex('kfguid')),
+      qydm: cursor.getString(cursor.getColumnIndex('qydm')),
+      qymc: cursor.getString(cursor.getColumnIndex('qymc')),
+      qybz: cursor.getString(cursor.getColumnIndex('qybz'))
+    }
+    return info;
+  }
+
+  getEntityId(item: QyInfo): ValueType {
+    return item.guid;
+  }
+
+  getColumnId(): string {
+    return "guid";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'ckdwguid', 'kfdm', 'kfguid', 'qydm', 'qymc', 'qybz'];
+  }
+
+  getCreateTableSql(): string {
+    const qy_sql = `create table if not exists TAB_BZGL_KNZY_APP_QYB(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"CKDWGUID" TEXT,
+							"KFDM" TEXT,
+							"KFGUID" TEXT,
+							"QYDM" TEXT,
+							"QYMC" TEXT,
+							"QYBZ" TEXT
+						  )`;
+    return qy_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/SmInfoDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { SmInfo } from '../../entity/SmInfo';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+
+/**
+ * 扫描记录数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'SCAN_LOG_TABLE' })
+export class SmInfoDao extends BaseTable<SmInfo> {
+  toBean(cursor: relationalStore.ResultSet): SmInfo {
+    let info: SmInfo = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      scandata: cursor.getLong(cursor.getColumnIndex('scandata')),
+      scantype: cursor.getLong(cursor.getColumnIndex('scantype')),
+      time: cursor.getString(cursor.getColumnIndex('time'))
+    }
+    return info;
+  }
+
+  getEntityId(item: SmInfo): ValueType {
+    return item.guid;
+  }
+
+  getColumnId(): string {
+    return "guid";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'scandata', 'scantype', 'time'];
+  }
+
+  getCreateTableSql(): string {
+    const scan_sql = `create table if not exists SCAN_LOG_TABLE(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"SCANDATA" INTEGER,
+							"SCANTYPE" INTEGER,
+							"TIME" TEXT
+						  )`;
+    return scan_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/WzcrkDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { Wzcrk } from '../../entity/Wzcrk';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+
+/**
+ * 物资出入库数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'TAB_BZGL_KNZY_APP_WZCRK' })
+export class WzcrkDao extends BaseTable<Wzcrk> {
+  toBean(cursor: relationalStore.ResultSet): Wzcrk {
+    let info: Wzcrk = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      gznd: cursor.getString(cursor.getColumnIndex('gznd')),
+      crkrq: cursor.getString(cursor.getColumnIndex('crkrq')),
+      ckdwguid: cursor.getString(cursor.getColumnIndex('ckdwguid')),
+      czr: cursor.getString(cursor.getColumnIndex('czr')),
+      qrzt: cursor.getString(cursor.getColumnIndex('qrzt')),
+      crklx: cursor.getString(cursor.getColumnIndex('crklx')),
+      pzzbguid: cursor.getString(cursor.getColumnIndex('pzzbguid')),
+      pzlx: cursor.getString(cursor.getColumnIndex('pzlx')),
+      pzh: cursor.getLong(cursor.getColumnIndex('pzh')),
+      sjlx: cursor.getString(cursor.getColumnIndex('sjlx')),
+      pzszlx: cursor.getString(cursor.getColumnIndex('pzszlx')),
+      sfdw: cursor.getString(cursor.getColumnIndex('sfdw')),
+      wczt: cursor.getString(cursor.getColumnIndex('wczt')),
+      kfdm: cursor.getString(cursor.getColumnIndex('kfdm')),
+      rkkfdm: cursor.getString(cursor.getColumnIndex('rkkfdm')),
+      pzsl: cursor.getLong(cursor.getColumnIndex('pzsl')),
+      crksl: cursor.getLong(cursor.getColumnIndex('crksl')),
+      ydh: cursor.getString(cursor.getColumnIndex('ydh')),
+      fwgldwdm: cursor.getString(cursor.getColumnIndex('fwgldwdm')),
+      swgldwdm: cursor.getString(cursor.getColumnIndex('swgldwdm')),
+      kfguid: cursor.getString(cursor.getColumnIndex('kfguid')),
+      zmlx: cursor.getString(cursor.getColumnIndex('zmlx')),
+      bdguid: cursor.getString(cursor.getColumnIndex('bdguid')),
+      dec: cursor.getString(cursor.getColumnIndex('dec'))
+    }
+    return info;
+  }
+
+  getEntityId(item: Wzcrk): ValueType {
+    return item.guid;
+  }
+
+  getColumnId(): string {
+    return "guid";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'gznd', 'crkrq', 'ckdwguid', 'czr', 'qrzt', 'crklx', 'pzzbguid', 'pzlx', 'pzh', 'sjlx', 'pzszlx',
+      'sfdw', 'wczt', 'kfdm', 'rkkfdm', 'pzsl', 'crksl', 'ydh', 'fwgldwdm', 'swgldwdm', 'kfguid', 'zmlx', 'bdguid', 'dec'];
+  }
+
+  getCreateTableSql(): string {
+    const wzcrk_sql = `create table if not exists TAB_BZGL_KNZY_APP_WZCRK(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"GZND" INTEGER,
+							"CRKRQ" TEXT,
+							"CKDWGUID" TEXT,
+							"CZR" TEXT,
+							"QRZT" TEXT,
+							"CRKLX" TEXT,
+							"PZZBGUID" TEXT,
+							"PZLX" TEXT,
+							"PZH" INTEGER,
+							"SJLX" TEXT,
+							"PZSZLX" TEXT,
+							"SFDW" TEXT,
+							"WCZT" TEXT,
+							"KFDM" TEXT,
+							"RKKFDM" TEXT,
+							"PZSL" INTEGER,
+							"CRKSL" INTEGER,
+							"YDH" TEXT,
+							"FWGLDWDM" TEXT,
+							"SWGLDWDM" TEXT,
+							"KFGUID" TEXT,
+							"ZMLX" TEXT,
+							"BDGUID" TEXT,
+							"DEC" TEXT
+						  )`;
+    return wzcrk_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/WzcrkmxDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { Wzcrkmx } from '../../entity/Wzcrkmx';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+
+/**
+ * 物资出入库明细数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'TAB_BZGL_KNZY_APP_WZCRKMX' })
+export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
+  toBean(cursor: relationalStore.ResultSet): Wzcrkmx {
+    let info: Wzcrkmx = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      gznd: cursor.getString(cursor.getColumnIndex('gznd')),
+      pmdmcode: cursor.getString(cursor.getColumnIndex('pmdmcode')),
+      pzsl: cursor.getLong(cursor.getColumnIndex('pzsl')),
+      crksl: cursor.getLong(cursor.getColumnIndex('crksl')),
+      wzcrkguid: cursor.getString(cursor.getColumnIndex('wzcrkguid')),
+      hwh: cursor.getString(cursor.getColumnIndex('hwh')),
+      pzmxguid: cursor.getString(cursor.getColumnIndex('pzmxguid'))
+    };
+    return info;
+  }
+
+  getEntityId(item: Wzcrkmx): ValueType {
+    return item.guid;
+  }
+
+  getColumnId(): string {
+    return "guid";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'gznd', 'pmdmcode', 'pzsl', 'crksl', 'wzcrkguid', 'hwh', 'pzmxguid']
+  }
+
+  getCreateTableSql(): string {
+    const wzcrkmx_sql = `create table if not exists TAB_BZGL_KNZY_APP_WZCRKMX(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"GZND" INTEGER,
+							"PMDMCODE" TEXT,
+							"PZSL" INTEGER,
+							"CRKSL" INTEGER,
+							"WZCRKGUID" TEXT,
+							"HWH" TEXT,
+							"PZMXGUID" TEXT
+						  )`;
+    return wzcrkmx_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/WzdmDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { Wzdm } from '../../entity/Wzdm';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+
+/**
+ * 物资信息数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'TAB_XTWH_JCSJ_WZDM' })
+export class WzdmDao extends BaseTable<Wzdm> {
+  toBean(cursor: relationalStore.ResultSet): Wzdm {
+    let info: Wzdm = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      drxh: cursor.getString(cursor.getColumnIndex('drxh')),
+      fldm: cursor.getString(cursor.getColumnIndex('fldm')),
+      lsm: cursor.getString(cursor.getColumnIndex('lsm')),
+      dmlbbm: cursor.getString(cursor.getColumnIndex('dmlbbm')),
+      dmlbmc: cursor.getString(cursor.getColumnIndex('dmlbmc')),
+      wzdm: cursor.getString(cursor.getColumnIndex('wzdm')),
+      hxdm: cursor.getString(cursor.getColumnIndex('hxdm')),
+      hxlbbsm: cursor.getString(cursor.getColumnIndex('hxlbbsm')),
+      sfdel: cursor.getString(cursor.getColumnIndex('sfdel'))
+    }
+    return info;
+  }
+
+  getEntityId(item: Wzdm): ValueType {
+    return item.guid;
+  }
+
+  getColumnId(): string {
+    return "guid";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'drxh', 'fldm', 'lsm', 'dmlbbm', 'dmlbmc', 'wzdm', 'hxdm', 'hxlbbsm', 'sfdel'];
+  }
+
+  getCreateTableSql(): string {
+    const wzdm_sql = `create table if not exists TAB_XTWH_JCSJ_WZDM(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"DRXH" TEXT,
+							"FLDM" TEXT,
+							"LSM" TEXT NOT NULL,
+							"DMLBBM" TEXT,
+							"DMLBMC" TEXT,
+							"WZDM" TEXT NOT NULL,
+							"HXDM" TEXT NOT NULL,
+							"HXLBBSM" TEXT,
+							"SFDEL" TEXT
+						  )`;
+    return wzdm_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/WzhxdmDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { Wzhxdm } from '../../entity/Wzhxdm';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+
+/**
+ * 物资号型融合数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'TAB_XTWH_JCSJ_WZHXDM' })
+export class WzhxdmDao extends BaseTable<Wzhxdm> {
+  toBean(cursor: relationalStore.ResultSet): Wzhxdm {
+    let info: Wzhxdm = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      drxh: cursor.getString(cursor.getColumnIndex('drxh')),
+      fldm: cursor.getString(cursor.getColumnIndex('fldm')),
+      lsm: cursor.getString(cursor.getColumnIndex('lsm')),
+      dmlbbm: cursor.getString(cursor.getColumnIndex('dmlbbm')),
+      dmlbmc: cursor.getString(cursor.getColumnIndex('dmlbmc')),
+      wzdm: cursor.getString(cursor.getColumnIndex('wzdm')),
+      hxdm: cursor.getString(cursor.getColumnIndex('hxdm')),
+      hxlbbsm: cursor.getString(cursor.getColumnIndex('hxlbbsm')),
+      sfdel: cursor.getString(cursor.getColumnIndex('sfdel')),
+      pmdmten: cursor.getString(cursor.getColumnIndex('pmdmten')),
+      wzpm: cursor.getString(cursor.getColumnIndex('wzpm')),
+      hxmc: cursor.getString(cursor.getColumnIndex('hxmc'))
+    }
+    return info;
+  }
+
+  getEntityId(item: Wzhxdm): ValueType {
+    return item.pmdmten;
+  }
+
+  getColumnId(): string {
+    return "PMDMTEN";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'drxh', 'fldm', 'lsm', 'dmlbbm', 'dmlbmc', 'wzdm', 'hxdm', 'hxlbbsm', 'sfdel', 'pmdmten', 'wzpm', 'hxmc'];
+  }
+
+  getCreateTableSql(): string {
+    const wzhxdm_sql = `create table if not exists TAB_XTWH_JCSJ_WZHXDM(
+							"GUID" TEXT NOT NULL,
+							"DRXH" TEXT,
+							"FLDM" TEXT,
+							"LSM" TEXT NOT NULL,
+							"DMLBBM" TEXT,
+							"DMLBMC" TEXT,
+							"WZDM" TEXT NOT NULL,
+							"HXDM" TEXT NOT NULL,
+							"HXLBBSM" TEXT,
+							"SFDEL" TEXT,
+							"PMDMTEN" TEXT NOT NULL PRIMARY KEY,
+							"WZPM" TEXT NOT NULL,
+							"HXMC" TEXT NOT NULL
+						  )`;
+    return wzhxdm_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/XtpzInfoDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { XtpzInfo } from '../../entity/XtpzInfo';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+/**
+ * 意见反馈数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'SYSCONFIG_TABLE' })
+export class XtpzInfoDao extends BaseTable<XtpzInfo> {
+  toBean(cursor: relationalStore.ResultSet): XtpzInfo {
+    let info: XtpzInfo = {
+      appid: cursor.getString(cursor.getColumnIndex('appid')),
+      importbbh: cursor.getString(cursor.getColumnIndex('importbbh')),
+      xlh: cursor.getString(cursor.getColumnIndex('xlh')),
+      inform: cursor.getString(cursor.getColumnIndex('inform')),
+      systemname: cursor.getString(cursor.getColumnIndex('systemname')),
+      version: cursor.getString(cursor.getColumnIndex('version')),
+      gznd: cursor.getString(cursor.getColumnIndex('gznd')),
+      httpurl: cursor.getString(cursor.getColumnIndex('httpurl')),
+      httpport: cursor.getString(cursor.getColumnIndex('httpport')),
+      socketurl: cursor.getString(cursor.getColumnIndex('socketurl')),
+      socketport: cursor.getString(cursor.getColumnIndex('socketport')),
+      themename: cursor.getString(cursor.getColumnIndex('themename')),
+      themecolor: cursor.getString(cursor.getColumnIndex('themecolor')),
+      reconnectionmode: cursor.getString(cursor.getColumnIndex('reconnectionmode')),
+      pushmode: cursor.getString(cursor.getColumnIndex('pushmode')),
+      transmissionmode: cursor.getString(cursor.getColumnIndex('transmissionmode')),
+      continuescanmode: cursor.getString(cursor.getColumnIndex('continuescanmode')),
+      scanreadmode: cursor.getString(cursor.getColumnIndex('scanreadmode')),
+      scanningmode: cursor.getString(cursor.getColumnIndex('scanningmode')),
+      boradcastkey: cursor.getString(cursor.getColumnIndex('boradcastkey')),
+      power: cursor.getString(cursor.getColumnIndex('power'))
+    };
+    return info;
+  }
+
+  getEntityId(item: XtpzInfo): ValueType {
+    return item.appid;
+  }
+
+  getColumnId(): string {
+    return "appid";
+  }
+
+  getTableColumns(): string[] {
+    return ['appid', 'importbbh', 'xlh', 'inform', 'systemname', 'version', 'gznd', 'httpurl', 'httpport', 'socketurl', 'socketport', 'themename',
+      'themecolor', 'reconnectionmode', 'pushmode', 'transmissionmode', 'continuescanmode', 'scanreadmode', 'scanningmode', 'boradcastkey', 'power']
+  }
+
+  getCreateTableSql(): string {
+    const sysConfig_sql = `create table if not exists SYSCONFIG_TABLE(
+							"APPID" TEXT NOT NULL PRIMARY KEY,
+							"IMPORTBBH" TEXT,
+							"XLH" TEXT,
+							"INFORM" TEXT,
+							"SYSTEMNAME" TEXT,
+							"VERSION" TEXT,
+							"GZND" TEXT,
+							"HTTPURL" TEXT,
+							"HTTPPORT" TEXT,
+							"SCOKETURL" TEXT,
+							"SCOKETPORT" TEXT,
+							"THEMENAME" TEXT,
+							"THEMECOLOR" TEXT,
+							"RECONNECTIONMODE" TEXT,
+							"PUSHMODE" TEXT,
+							"TRANSMISSIONMODE" TEXT,
+							"CONTINUESCANMODE" TEXT,
+							"SCANREADMODE" TEXT,
+							"SCANNINGMODE" TEXT,
+							"BROADCASTKEY" TEXT,
+							"POWER" TEXT
+						  )`;
+    return sysConfig_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/db/dao/YjfkDao.ets

+import relationalStore from '@ohos.data.relationalStore';
+import { Yjfk } from '../../entity/Yjfk';
+import BaseTable, { ValueType } from '../BaseTable';
+import { Table } from '../decorator/Decorators';
+
+
+/**
+ * 意见反馈数据服务
+ */
+@Table({ db: 'db_wms_app', name: 'YJFAK_TABLE' })
+export class YjfkDao extends BaseTable<Yjfk> {
+  toBean(cursor: relationalStore.ResultSet): Yjfk {
+    let info: Yjfk = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      yj: cursor.getString(cursor.getColumnIndex('yj')),
+      picturelist: cursor.getString(cursor.getColumnIndex('picturelist')),
+      skh: cursor.getString(cursor.getColumnIndex('skh')),
+    }
+    return info;
+  }
+
+  getEntityId(item: Yjfk): ValueType {
+    return item.guid;
+  }
+
+  getColumnId(): string {
+    return "guid";
+  }
+
+  getTableColumns(): string[] {
+    return ['guid', 'yj', 'picturelist', 'skh']
+  }
+
+  getCreateTableSql(): string {
+    const yjfk_sql = `create table if not exists YJFAK_TABLE(
+              "GUID" TEXT NOT NULL PRIMARY KEY,
+							"YJ" TEXT,
+							"PICTURELIST" TEXT,
+							"SKH" TEXT
+						  )`;
+    return yjfk_sql;
+  }
+}
\ No newline at end of file

common/src/main/ets/entity/Wzcrk.ts

 /**
  * 物资出入库信息
  */
-export interface WzcrkInfo {
+export interface Wzcrk {
   guid?: string,
   /**
    * 工作年度

common/src/main/ets/entity/Yjfk.ts

@@ -2,7 +2,8 @@
  * 意见反馈
  */
 export interface Yjfk {
+  guid?: string,
   yj: string,
-  PICTUREList: string,
+  picturelist: string,
   skh: string
 }
\ No newline at end of file

entry/src/main/ets/pages/metailmange/AddAdjustModelPage.ets

@@ -277,7 +277,7 @@ struct AddAdjustModelPage{
   build() {
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "物资新增" }).padding({bottom:10})
+        TitleBar({ title: "物资新增" })
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/pages/metailmange/AddConversionPage.ets

@@ -262,7 +262,7 @@ struct AddConversionPage {
   build() {
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "物资换位" }).padding({bottom:10})
+        TitleBar({ title: "物资换位" })
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/pages/metailmange/AddTemporaryInPage.ets

@@ -281,7 +281,7 @@ export struct AddTemporaryInPage {
   build() {
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "物资新增" }).padding({ bottom: 10 })
+        TitleBar({ title: "物资新增" })
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column() {

entry/src/main/ets/pages/metailmange/AddTemporaryOutPage.ets

@@ -270,7 +270,7 @@ struct AddTemporaryOutPage{
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "物资新增"}).padding({bottom:10})
+        TitleBar({ title: "物资新增"})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/pages/metailmange/WzConversionPage.ets

@@ -76,9 +76,6 @@ struct WzConversionPage{
         Column() {
           Demo({itemClick: this.itemClick}).width('90%')
         }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
-        Column(){
-          BasicTable({dataSource:[]})
-        }.flexGrow(1)
       }
     }.linearGradient({
       direction: GradientDirection.Right, // 渐变方向

entry/src/main/ets/pages/metailmange/WzPositionPage.ets

@@ -70,7 +70,6 @@ struct WzPositionPage{
         Column() {
           Demo({itemClick: this.itemClick}).width('90%')
         }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
-
       }
     }.linearGradient({
       direction: GradientDirection.Right, // 渐变方向

entry/src/main/ets/pages/order_detail/PzAdjustModelPage.ets

@@ -294,7 +294,7 @@ struct PzAdjustModelPage{
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "凭证详情"}).padding({bottom:10})
+        TitleBar({ title: "凭证详情"})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/pages/order_detail/PzInOutDetailPage.ets

@@ -267,7 +267,7 @@ struct PzInOutDetailPage{
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "凭证详情"}).padding({bottom:10})
+        TitleBar({ title: "凭证详情"})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/pages/order_detail/PzInvDetailPage.ets

@@ -253,7 +253,7 @@ struct PzInvDetailPage{
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "凭证详情"}).padding({bottom:10})
+        TitleBar({ title: "凭证详情"})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/pages/order_detail/PzPourStoragePage.ets

@@ -332,7 +332,7 @@ struct PzPourStoragePage{
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "凭证详情"}).padding({bottom:10})
+        TitleBar({ title: "凭证详情"})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/view/title/TitleBar.ets

@@ -37,6 +37,6 @@ export struct TitleBar {
           }
         }.width('100%')
       }.width('100%').layoutWeight(1)
-    }.padding({top: `${StatusBarManager.get().getSystemBarOffset()}px`}).width('100%').height(65)
+    }.padding({top: `${StatusBarManager.get().getSystemBarOffset()}px`}).width('100%').height("10%")
   }
 }
\ No newline at end of file