Merge remote-tracking branch 'origin/master'

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

@@ -31,7 +31,9 @@ export default abstract class BaseTable<T> implements ITable {
       name: this.dbName,
       securityLevel: rdb.SecurityLevel.S4
     })
+    Logger.info(this,"开始执行====")
     await this.init(db);
+    Logger.info(this,"结束执行====")
     return db;
   }
 

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { Bggl } from '../../entity/Bggl';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 
 /**
@@ -45,26 +46,7 @@ export class BgglDao extends BaseTable<Bggl> {
   }
 
   getCreateTableSql(): string {
-    const bggl_sql = `create table if not exists TAB_BZGL_KNZY_APP_BGGL(
-						  							"GUID" TEXT NOT NULL PRIMARY KEY,
-						  							"DDH" TEXT,
-						  							"XS" INTEGER,
-													  "PC" INTEGER,
-						  							"FWDW" TEXT,
-						  							"BGZT" TEXT,
-													  "SLR" TEXT,
-                            "SLDWDM" TEXT,
-                            "SJH" INTEGER,
-                            "JSSJ" TEXT,
-                            "CKSJ" TEXT,
-                            "SFDC" TEXT,
-                            "SFDF" TEXT,
-                            "KFDM" TEXT,
-                            "HWH" TEXT,
-                            "QJM" TEXT,
-                            "DFJE" INTEGER
-                            )`;
-    return bggl_sql;
+    return NativeSql.getBgglTable();
   }
 
   /**

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { Bzhx } from '../../entity/Bzhx';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 
 /**
@@ -39,20 +40,7 @@ export class BzhxDao extends BaseTable<Bzhx> {
   }
 
   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,
-							"LSM" TEXT
-						  )`;
-    return bzhx_sql;
+    return NativeSql.getBzhxTable();
   }
 
   // 获取被装号型列表
@@ -76,8 +64,7 @@ export class BzhxDao extends BaseTable<Bzhx> {
   }
 
 
-
-  async selectWZInfo(lsm?:string):Promise<Bzhx[]>{
+  async selectWZInfo(lsm?: string): Promise<Bzhx[]> {
     let wp = this.getPredicates();
     if (lsm) {
       wp.equalTo('LSM', lsm);

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { DcInfo } from '../../entity/DcInfo';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 /**
  * 导出记录数据服务
@@ -32,14 +33,6 @@ export class DcInfoDao extends BaseTable<DcInfo> {
   }
 
   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;
+    return NativeSql.getDcInfoTable();
   }
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { DrInfo } from '../../entity/DrInfo';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 /**
  * 导入记录数据服务
@@ -32,15 +33,7 @@ export class DrInfoDao extends BaseTable<DrInfo> {
   }
 
   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;
+    return NativeSql.getDrInfoTable();
   }
   /**
    * 查询导入列表

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { DsRfid } from '../../entity/DsRfid';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 /**
  * RFID点数数据服务
@@ -35,36 +36,22 @@ export class DsRfidDao extends BaseTable<DsRfid> {
   }
 
   getTableColumns(): string[] {
-    return ['guid', 'wzcrkguid', 'pmdmcode', 'lsm','pmmc', 'pmdm', 'hxmc', 'xh', 'sl', 'hwh', 'epc', 'subepc']
+    return ['guid', 'wzcrkguid', 'pmdmcode', 'lsm', '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,
-							"LSM" TEXT,
-							"PMMC" TEXT,
-							"PMDM" TEXT,
-							"HXMC" TEXT,
-							"XH" TEXT,
-							"SL" TEXT,
-							"HWH" TEXT,
-							"EPC" TEXT,
-							"SUBEPC" TEXT
-						  )`;
-    return count_sql;
+    return NativeSql.getDsRfidTable();
   }
   /*查询上架---sjType：0（待上架），1(已上架)*/
-  async getselectSJList(wzcrkguid: string,sjType:number): Promise<DsRfid[]> {
+  async getselectSJList(wzcrkguid: string, sjType: number): Promise<DsRfid[]> {
     let wp = this.getPredicates();
     if (wzcrkguid) {
       wp.equalTo('WZCRKGUID', wzcrkguid);
     }
-    if(sjType==0){
-      wp.equalTo("HWH","暂无")
-    }else {
-      wp.notEqualTo("HWH","暂无")
+    if (sjType == 0) {
+      wp.equalTo("HWH", "暂无")
+    } else {
+      wp.notEqualTo("HWH", "暂无")
     }
     wp.orderByAsc('HWH');
     return this.query(wp, this.getTableColumns())

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { DwInfo } from '../../entity/DwInfo';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 /**
  * 单位的数据层
@@ -36,19 +37,7 @@ export class DwInfoDao extends BaseTable<DwInfo> {
   }
 
   getCreateTableSql(): string {
-    const dw_sql =
-      `create table if not exists TAB_BZGL_KNZY_APP_BGDW(
-          "GUID" TEXT NOT NULL PRIMARY KEY,
-          "DWDM" TEXT,
-          "DWMC" TEXT,
-          "DWDH" TEXT,
-          "DWJC" TEXT,
-          "DWXZ" TEXT,
-          "JGBDH" TEXT,
-          "JGBFH" TEXT,
-          "JGBJC" TEXT
-          )`;
-    return dw_sql;
+    return NativeSql.getDwInfoTable();
   }
 
   /**

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { Gldw } from '../../entity/Gldw';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 /**
  * 管理单位的数据层
@@ -37,14 +38,7 @@ export class GldwDao extends BaseTable<Gldw> {
   }
 
   getCreateTableSql(): string {
-    const gldw_sql =
-      `create table if not exists TAB_BZGL_KNZY_APP_BGDDW(
-        "GUID" TEXT NOT NULL PRIMARY KEY,
-        "DWFH" TEXT,
-        "DWDM" TEXT,
-        "DWXZ" TEXT
-        )`;
-    return gldw_sql;
+    return NativeSql.getGldwTable();
   }
 
   /**
@@ -63,10 +57,10 @@ export class GldwDao extends BaseTable<Gldw> {
    * 询管理单位列表
    * @param 库房名称
    */
-  async queryByData(data:Partial<Gldw>): Promise<Gldw[]> {
+  async queryByData(data: Partial<Gldw>): Promise<Gldw[]> {
     let wp = this.getPredicates();
     for (const [key, value] of Object.entries(data)) {
-      wp.equalTo(key,value)
+      wp.equalTo(key, value)
     }
     wp.orderByAsc("DWDM");
     return this.query(wp, this.getTableColumns());

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { HjInfo } from '../../entity/HjInfo';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 /**
  * 货架信息的数据服务
@@ -36,17 +37,7 @@ export class HjInfoDao extends BaseTable<HjInfo> {
   }
 
   getCreateTableSql(): string {
-    const hj_sql = `create table if not exists TAB_BZGL_KNZY_APP_HJB(
-							"GUID" TEXT NOT NULL PRIMARY KEY,
-							"HJH" TEXT,
-							"HJMC" TEXT,
-							"HJCS" INTEGER,
-							"MCHWS" INTEGER,
-							"HJRL" INTEGER,
-							"HJBZ" TEXT,
-							"QYGUID" TEXT
-						  )`;
-    return hj_sql;
+    return NativeSql.getHjInfoTable();
   }
 
   async getHjList(no: string): Promise<HjInfo[]> {

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { HwInfo } from '../../entity/HwInfo';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 
 /**
@@ -38,20 +39,9 @@ export class HwInfoDao extends BaseTable<HwInfo> {
   }
 
   getCreateTableSql(): string {
-    const hw_sql = `create table if not exists tab_bzgl_knzy_app_hwb(
-							"GUID" TEXT NOT NULL PRIMARY KEY,
-							"HWH" TEXT,
-							"PMDMCODE" TEXT,
-							"HWSL" INTEGER,
-							"HJGUID" TEXT,
-							"HWZT" TEXT,
-							"HWXGSJ" TEXT,
-							"GLDWGUID" TEXT,
-							"KFGUID" TEXT,
-							"ZMLX" TEXT
-						  )`;
-    return hw_sql;
+    return NativeSql.getHwInfoTable();
   }
+
   async getHwList(no: string): Promise<HwInfo[]> {
     let wp = this.getPredicates();
     if (no) {
@@ -60,6 +50,7 @@ export class HwInfoDao extends BaseTable<HwInfo> {
     wp.orderByAsc('HWH');
     return this.query(wp, this.getTableColumns())
   }
+
   async getselectHwList(kfguid: string): Promise<HwInfo[]> {
     let wp = this.getPredicates();
     if (kfguid) {

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

@@ -3,6 +3,7 @@ import { Hwgh } from '../../entity/Hwgh';
 import { HwInfo } from '../../entity/HwInfo';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 import { HwInfoDao } from './HwInfoDao';
 
 
@@ -34,14 +35,7 @@ export class HwghDao extends BaseTable<Hwgh> {
   }
 
   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;
+    return NativeSql.getHwghTable();
   }
-
 }
 

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore'
 import { KfInfo } from '../../entity/KfInfo'
 import BaseTable, { ValueType } from '../BaseTable'
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 /**
  * 库房信息数据服务
@@ -33,28 +34,20 @@ export class KfInfoDao extends BaseTable<KfInfo> {
   }
 
   getCreateTableSql(): string {
-    const kf_sql = `create table if not exists TAB_BZGL_KNZY_APP_DWKF(
-							"GUID" TEXT NOT NULL PRIMARY KEY,
-							"KFDM" TEXT,
-							"KFMC" TEXT,
-							"KFLX" TEXT,
-							"YXJ" INTEGER,
-							"ISDEFAULT" TEXT
-						  )`;
-    return kf_sql;
+    return NativeSql.getKfInfoTable();
   }
 
   /**
    * 查询库房列表
    * @param 库房名称
    */
-  async getKf(data:Partial<KfInfo>): Promise<KfInfo[]> {
+  async getKf(data: Partial<KfInfo>): Promise<KfInfo[]> {
     let wp = this.getPredicates();
     // if (kfmc) {
     //   wp.like('KFMC', `%${kfmc}%`);
     // }
     for (const [key, value] of Object.entries(data)) {
-      wp.equalTo(key,value)
+      wp.equalTo(key, value)
     }
     wp.orderByAsc("KFDM");
     return this.query(wp, this.getTableColumns());

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { QyInfo } from '../../entity/QyInfo';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 /**
  * 区域信息数据服务
@@ -34,17 +35,9 @@ export class QyInfoDao extends BaseTable<QyInfo> {
   }
 
   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;
+    return NativeSql.getQyInfoTable();
   }
+
   async getQy(qydm: string): Promise<QyInfo[]> {
     let wp = this.getPredicates();
     if (qydm) {

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { SmInfo } from '../../entity/SmInfo';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 
 /**
@@ -32,12 +33,6 @@ export class SmInfoDao extends BaseTable<SmInfo> {
   }
 
   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;
+    return NativeSql.getSmInfoTable();
   }
 }
\ No newline at end of file

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

@@ -2,38 +2,39 @@ import relationalStore from '@ohos.data.relationalStore';
 import { Viewdrdc } from '../../entity/Viewdrdc';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 /**
  * 扫描记录数据服务
  */
 @Table({ db: 'db_wms_app', name: 'view_dr_dc' })
 export class ViewdrdcDao extends BaseTable<Viewdrdc> {
-
   toBean(cursor: relationalStore.ResultSet): Viewdrdc {
-    let info:Viewdrdc = {
-      guid:cursor.getString(cursor.getColumnIndex('guid')),
-      jhguid:cursor.getString(cursor.getColumnIndex('jhguid')),
-      gznd:cursor.getString(cursor.getColumnIndex('gznd')),
-      sfdw:cursor.getString(cursor.getColumnIndex('sfdw')),
-      ydh:cursor.getString(cursor.getColumnIndex('ydh')),
-      fwgldwdm:cursor.getString(cursor.getColumnIndex('fwgldwdm')),
-      swgldwdm:cursor.getString(cursor.getColumnIndex('swgldwdm')),
-      fwgldwguid:cursor.getString(cursor.getColumnIndex('fwgldwguid')),
-      swgldwguid:cursor.getString(cursor.getColumnIndex('swgldwguid')),
-      zmlx:cursor.getString(cursor.getColumnIndex('zmlx')),
-      dec:cursor.getString(cursor.getColumnIndex('dec')),
-      pzh:cursor.getString(cursor.getColumnIndex('pzh')),
-      pzlx:cursor.getString(cursor.getColumnIndex('pzlx')),
-      ckdwguid:cursor.getString(cursor.getColumnIndex('ckdwguid')),
-      kfdm:cursor.getString(cursor.getColumnIndex('kfdm')),
-      jhmxguid:cursor.getString(cursor.getColumnIndex('jhmxguid')),
-      hwh:cursor.getString(cursor.getColumnIndex('hwh')),
-      pmdmcode:cursor.getString(cursor.getColumnIndex('pmdmcode')),
-      pzsl:cursor.getLong(cursor.getColumnIndex('pzsl')),
-      crksl:cursor.getLong(cursor.getColumnIndex('crksl')),
-      wzdm:cursor.getString(cursor.getColumnIndex('wzdm'))
+    let info: Viewdrdc = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      jhguid: cursor.getString(cursor.getColumnIndex('jhguid')),
+      gznd: cursor.getString(cursor.getColumnIndex('gznd')),
+      sfdw: cursor.getString(cursor.getColumnIndex('sfdw')),
+      ydh: cursor.getString(cursor.getColumnIndex('ydh')),
+      fwgldwdm: cursor.getString(cursor.getColumnIndex('fwgldwdm')),
+      swgldwdm: cursor.getString(cursor.getColumnIndex('swgldwdm')),
+      fwgldwguid: cursor.getString(cursor.getColumnIndex('fwgldwguid')),
+      swgldwguid: cursor.getString(cursor.getColumnIndex('swgldwguid')),
+      zmlx: cursor.getString(cursor.getColumnIndex('zmlx')),
+      dec: cursor.getString(cursor.getColumnIndex('dec')),
+      pzh: cursor.getString(cursor.getColumnIndex('pzh')),
+      pzlx: cursor.getString(cursor.getColumnIndex('pzlx')),
+      ckdwguid: cursor.getString(cursor.getColumnIndex('ckdwguid')),
+      kfdm: cursor.getString(cursor.getColumnIndex('kfdm')),
+      jhmxguid: cursor.getString(cursor.getColumnIndex('jhmxguid')),
+      hwh: cursor.getString(cursor.getColumnIndex('hwh')),
+      pmdmcode: cursor.getString(cursor.getColumnIndex('pmdmcode')),
+      pzsl: cursor.getLong(cursor.getColumnIndex('pzsl')),
+      crksl: cursor.getLong(cursor.getColumnIndex('crksl')),
+      wzdm: cursor.getString(cursor.getColumnIndex('wzdm')),
+      wczt: cursor.getString(cursor.getColumnIndex('wczt')),
     };
-    return info ;
+    return info;
   }
 
   getEntityId(item: Viewdrdc): ValueType {
@@ -45,38 +46,21 @@ export class ViewdrdcDao extends BaseTable<Viewdrdc> {
   }
 
   getTableColumns(): string[] {
-    return ['guid', 'jhguid', 'gznd', 'sfdw', 'ydh', 'fwgldwdm', 'swgldwdm', 'fwgldwguid', 'swgldwguid', 'zmlx', 'dec', 'pzh', 'pzlx', 'ckdwguid', 'kfdm', 'jhmxguid', 'hwh', 'pmdmcode', 'pzsl', 'crksl', 'wzdm'];
+    return ['guid', 'jhguid', 'gznd', 'sfdw', 'ydh', 'fwgldwdm', 'swgldwdm', 'fwgldwguid', 'swgldwguid', 'zmlx', 'dec', 'pzh', 'pzlx', 'ckdwguid', 'kfdm', 'jhmxguid', 'hwh', 'pmdmcode', 'pzsl', 'crksl', 'wzdm','wczt'];
   }
 
   getCreateTableSql(): string {
-    let sql_val = `create or replace view if not exists view_dr_dc as SELECT
-	    crk.guid guid,
-	    crk.pzzbguid jhguid,
-	    crk.gznd gznd,
-	    crk.sfdw sfdw,
-	    crk.ydh ydh,
-	    crk.fwgldwdm fwgldwdm,
-	    crk.swgldwdm swgldwdm,
-	    crk.fwgldwdm fwgldwguid,
-	    crk.swgldwdm swgldwguid,
-	    crk.zmlx zmlx,
-	    crk.DEC dec,
-	    crk.pzh pzh,
-	    crk.pzlx pzlx,
-	    crk.ckdwguid ckdwguid,
-	    crk.kfdm kfdm,
-	    mx.pzmxguid jhmxguid,
-	    mx.hwh hwh,
-	    mx.PMDMCODE pmdmcode,
-	    mx.PZSL pzsl,
-	    mx.CRKSL crksl,
-	    wzdm.LSM wzdm
-      FROM
-	    tab_bzgl_knzy_app_wzcrk crk
-	    LEFT JOIN tab_bzgl_knzy_app_wzcrkmx mx ON crk.GUID = mx.wzcrkguid
-	    LEFT JOIN TAB_XTWH_JCSJ_WZDM wzdm ON wzdm.HXDM = mx.PMDMCODE `;
-    return sql_val;
+    return NativeSql.getDrdcView();
   }
 
 
+  async getDrdc(data: Partial<Viewdrdc>): Promise<Viewdrdc[]> {
+    let wp = this.getPredicates();
+    for (const [key, value] of Object.entries(data)) {
+      if (value) {
+        wp.equalTo(key, value)
+      }
+    }
+    return this.query(wp, this.getTableColumns());
+  }
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import { Wzcrkmx } from '../../entity/Wzcrkmx';
 import { Logger } from '../../utils/Logger';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 
 /**
@@ -56,41 +57,14 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
   }
 
   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;
+    return NativeSql.getWzcrkTable();
   }
   /**
    * 查询是否有相同单据
    */
-  async getCommonDj(jhguid:string): Promise<Wzcrk[]>{
+  async getCommonDj(jhguid: string): Promise<Wzcrk[]> {
     let predicates = this.getPredicates()
-    if(jhguid){
+    if (jhguid) {
       predicates.equalTo("pzzbguid", "jhguid")
     }
     return this.query(predicates, this.getTableColumns())
@@ -99,23 +73,23 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
   /**
    * 删除
    */
-  async deleteWzzb(guid:string): Promise<number>{
+  async deleteWzzb(guid: string): Promise<number> {
     let predicates = this.getPredicates()
-    predicates.equalTo('guid',guid)
+    predicates.equalTo('guid', guid)
     return this.deleteAll(predicates)
   }
 
   /**
    * 更新凭证列表中的总数量和日扫描数量
    */
-  async updateZs(pzsl:number,crksl:number,wzcrkguid:string): Promise<number>{
+  async updateZs(pzsl: number, crksl: number, wzcrkguid: string): Promise<number> {
     let item: Wzcrk
     item.pzsl = pzsl
     item.crksl = crksl
 
     let predicates = this.getPredicates()
-    predicates.equalTo('guid',wzcrkguid)
-    return this.update(item,predicates)
+    predicates.equalTo('guid', wzcrkguid)
+    return this.update(item, predicates)
   }
 
   /**
@@ -148,7 +122,7 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
   }
 
 
-  async getWzcrk(data:Partial<Wzcrk>): Promise<Wzcrk[]> {
+  async getWzcrk(data: Partial<Wzcrk>): Promise<Wzcrk[]> {
     let wp = this.getPredicates();
     // if (pzh) {
     //   wp.equalTo('PZH', pzh)
@@ -159,7 +133,7 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
     // wp.equalTo('CRKLX', crklx)
     // wp.orderByAsc('PZH');
     for (const [key, value] of Object.entries(data)) {
-      if(value) {
+      if (value) {
         wp.equalTo(key, value)
       }
     }
@@ -178,5 +152,4 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
     }
     return items;
   }
-
 }
\ No newline at end of file

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

@@ -35,21 +35,11 @@ export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
   }
 
   getTableColumns(): string[] {
-    return ['guid', 'gznd', 'pmdmcode', 'pzsl', 'crksl', 'wzcrkguid', 'hwh', 'pzmxguid','wzdm']
+    return ['guid', 'gznd', 'pmdmcode', 'pzsl', 'crksl', 'wzcrkguid', 'hwh', 'pzmxguid', 'wzdm']
   }
 
   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;
+    return NativeSql.getWzcrkmxTable();
   }
 
   /**
@@ -164,7 +154,7 @@ export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
   }
 
   async queryByCrkGuid(wzcrkguid: string, wzpm?: string): Promise<WzcrkMxRefWzDto[]> {
-    try{
+    try {
       let val_sql = NativeSql.getSqlByCrkmx(wzcrkguid, wzpm);
       Logger.info(this, '查询SQL语句=' + val_sql)
       let db = await this.futureDb;
@@ -179,7 +169,7 @@ export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
       }
       Logger.info(this, 'queryAll items=' + JSON.stringify(items))
       return items;
-    }catch (e){
+    } catch (e) {
       throw new Error('[查询异常]|' + e)
     }
 

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { Wzdm } from '../../entity/Wzdm';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 import { SQLiteContext } from '../SQLiteContext';
 
 
@@ -39,21 +40,10 @@ export class WzdmDao extends BaseTable<Wzdm> {
   }
 
   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;
+    return NativeSql.getWzdmTable();
   }
-  async selectWZDM(lsm?:string):Promise<Wzdm[]>{
+
+  async selectWZDM(lsm?: string): Promise<Wzdm[]> {
     let wp = this.getPredicates();
     if (lsm) {
       wp.equalTo('LSM', lsm);

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

@@ -3,6 +3,7 @@ import { Wzhxdm } from '../../entity/Wzhxdm';
 import { Logger } from '../../utils/Logger';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 
 /**
@@ -42,22 +43,7 @@ export class WzhxdmDao extends BaseTable<Wzhxdm> {
   }
 
   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;
+    return NativeSql.getWzhxdmTable();
   }
 
   async selectHXList(sql?: string): Promise<Wzhxdm[]> {

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { XtpzInfo } from '../../entity/XtpzInfo';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 /**
  * 意见反馈数据服务
@@ -49,29 +50,6 @@ export class XtpzInfoDao extends BaseTable<XtpzInfo> {
   }
 
   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;
+    return NativeSql.getXtpzInfoTable();
   }
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ import relationalStore from '@ohos.data.relationalStore';
 import { Yjfk } from '../../entity/Yjfk';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
+import { NativeSql } from '../sql/NativeSql';
 
 
 /**
@@ -32,12 +33,6 @@ export class YjfkDao extends BaseTable<Yjfk> {
   }
 
   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;
+    return NativeSql.getYjfkTable();
   }
 }
\ No newline at end of file

common/src/main/ets/db/sql/NativeSql.ets

@@ -14,4 +14,397 @@ export class NativeSql {
     }
     return sql_val;
   }
+
+
+  /**
+   * 包裹管理表
+   */
+  static getBgglTable(): string {
+    const bggl_sql = `create table if not exists TAB_BZGL_KNZY_APP_BGGL(
+						  							"GUID" TEXT NOT NULL PRIMARY KEY,
+						  							"DDH" TEXT,
+						  							"XS" INTEGER,
+													  "PC" INTEGER,
+						  							"FWDW" TEXT,
+						  							"BGZT" TEXT,
+													  "SLR" TEXT,
+                            "SLDWDM" TEXT,
+                            "SJH" INTEGER,
+                            "JSSJ" TEXT,
+                            "CKSJ" TEXT,
+                            "SFDC" TEXT,
+                            "SFDF" TEXT,
+                            "KFDM" TEXT,
+                            "HWH" TEXT,
+                            "QJM" TEXT,
+                            "DFJE" INTEGER
+                            )`;
+    return bggl_sql;
+  }
+
+  /**
+   * 物资号型融合表
+   */
+  static getBzhxTable(): 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,
+							"LSM" TEXT
+						  )`;
+    return bzhx_sql;
+  }
+
+
+  /**
+   * 导出记录表
+   */
+  static getDcInfoTable(): 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;
+  }
+
+  /**
+   * 导入记录表
+   */
+  static getDrInfoTable(): 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;
+  }
+
+  /**
+   * RFID点数表
+   */
+  static getDsRfidTable(): string {
+    const count_sql = `create table if not exists COUNT_TABLE(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"WZCRKGUID" TEXT,
+							"PMDMCODE" TEXT,
+							"LSM" TEXT,
+							"PMMC" TEXT,
+							"PMDM" TEXT,
+							"HXMC" TEXT,
+							"XH" TEXT,
+							"SL" TEXT,
+							"HWH" TEXT,
+							"EPC" TEXT,
+							"SUBEPC" TEXT
+						  )`;
+    return count_sql;
+  }
+
+  /**
+   * 单位信息表
+   */
+  static getDwInfoTable(): string {
+    const dw_sql =
+      `create table if not exists TAB_BZGL_KNZY_APP_BGDW(
+          "GUID" TEXT NOT NULL PRIMARY KEY,
+          "DWDM" TEXT,
+          "DWMC" TEXT,
+          "DWDH" TEXT,
+          "DWJC" TEXT,
+          "DWXZ" TEXT,
+          "JGBDH" TEXT,
+          "JGBFH" TEXT,
+          "JGBJC" TEXT
+          )`;
+    return dw_sql;
+  }
+
+  /**
+   * 管理单位表
+   */
+  static getGldwTable(): string {
+    const gldw_sql =
+      `create table if not exists TAB_BZGL_KNZY_APP_BGDDW(
+        "GUID" TEXT NOT NULL PRIMARY KEY,
+        "DWFH" TEXT,
+        "DWDM" TEXT,
+        "DWXZ" TEXT
+        )`;
+    return gldw_sql;
+  }
+
+  /**
+   * 货架信息表
+   */
+  static getHjInfoTable(): string {
+    const hj_sql = `create table if not exists TAB_BZGL_KNZY_APP_HJB(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"HJH" TEXT,
+							"HJMC" TEXT,
+							"HJCS" INTEGER,
+							"MCHWS" INTEGER,
+							"HJRL" INTEGER,
+							"HJBZ" TEXT,
+							"QYGUID" TEXT
+						  )`;
+    return hj_sql;
+  }
+
+  /**
+   * 货位规划表
+   */
+  static getHwghTable(): 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;
+  }
+
+  /**
+   * 货位信息表
+   */
+  static getHwInfoTable(): string {
+    const hw_sql = `create table if not exists tab_bzgl_knzy_app_hwb(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"HWH" TEXT,
+							"PMDMCODE" TEXT,
+							"HWSL" INTEGER,
+							"HJGUID" TEXT,
+							"HWZT" TEXT,
+							"HWXGSJ" TEXT,
+							"GLDWGUID" TEXT,
+							"KFGUID" TEXT,
+							"ZMLX" TEXT
+						  )`;
+    return hw_sql;
+  }
+
+  /**
+   * 库房信息表
+   */
+  static getKfInfoTable(): string {
+    const kf_sql = `create table if not exists TAB_BZGL_KNZY_APP_DWKF(
+							"GUID" TEXT NOT NULL PRIMARY KEY,
+							"KFDM" TEXT,
+							"KFMC" TEXT,
+							"KFLX" TEXT,
+							"YXJ" INTEGER,
+							"ISDEFAULT" TEXT
+						  )`;
+    return kf_sql;
+  }
+
+  /**
+   * 区域信息表
+   */
+  static getQyInfoTable(): 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;
+  }
+
+  /**
+   * 扫描信息表
+   */
+  static getSmInfoTable(): 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;
+  }
+
+  /**
+   * 物资出入库表
+   */
+  static getWzcrkTable(): 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;
+  }
+
+
+  /**
+   * 物资出入库明细表
+   */
+  static getWzcrkmxTable(): 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;
+  }
+
+  /**
+   * 物资代码表
+   */
+  static getWzdmTable(): 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;
+  }
+
+  /**
+   * 物资号型融合表
+   */
+  static getWzhxdmTable(): 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;
+  }
+
+  /**
+   * 系统配置表
+   */
+  static getXtpzInfoTable(): 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;
+  }
+
+  /**
+   * 意见反馈表
+   */
+  static getYjfkTable(): 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;
+  }
+
+  /**
+   * 视图-导入导出
+   */
+  static getDrdcView(): string {
+    let sql_val = `create view if not exists view_dr_dc as SELECT
+	    crk.guid guid,
+	    crk.pzzbguid jhguid,
+	    crk.gznd gznd,
+	    crk.sfdw sfdw,
+	    crk.ydh ydh,
+	    crk.fwgldwdm fwgldwdm,
+	    crk.swgldwdm swgldwdm,
+	    crk.fwgldwdm fwgldwguid,
+	    crk.swgldwdm swgldwguid,
+	    crk.zmlx zmlx,
+	    crk.DEC dec,
+	    crk.pzh pzh,
+	    crk.pzlx pzlx,
+	    crk.ckdwguid ckdwguid,
+	    crk.kfdm kfdm,
+	    crk.wczt wczt,
+	    mx.pzmxguid jhmxguid,
+	    mx.hwh hwh,
+	    mx.PMDMCODE pmdmcode,
+	    mx.PZSL pzsl,
+	    mx.CRKSL crksl,
+	    wzdm.LSM wzdm
+      FROM
+	    tab_bzgl_knzy_app_wzcrk crk
+	    LEFT JOIN tab_bzgl_knzy_app_wzcrkmx mx ON crk.GUID = mx.wzcrkguid
+	    LEFT JOIN TAB_XTWH_JCSJ_WZDM wzdm ON wzdm.HXDM = mx.PMDMCODE `;
+    return sql_val;
+  }
 }
\ No newline at end of file

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

@@ -22,5 +22,6 @@ export interface Viewdrdc {
   pmdmcode: string,
   pzsl: number,
   crksl: number,
-  wzdm: string
+  wzdm: string,
+  wczt: string
 }
\ No newline at end of file

common/src/main/ets/utils/HttpUtil.ets

@@ -3,6 +3,7 @@ import type { AxiosInstance } from '@ohos/axios'
 import type { AxiosRequestConfig } from '@ohos/axios'
 import CommonConstant from '../constants/CommonConstants'
 import promptAction from '@ohos.promptAction'
+import { Logger } from './Logger'
 
 class Request {
   instance: AxiosInstance
@@ -27,6 +28,7 @@ class Request {
         return res.data.data
       },
       (err) => {
+        Logger.info('err...........+' + err)
         promptAction.showToast({
           message: $r('app.string.http_response_error')
         })

entry/src/main/ets/model/ViewdrdcModel.ets

+/**
+ * 导入导出的视图model
+ */
+import { SQLiteContext, ViewdrdcDao } from '@ohos/common';
+import { Viewdrdc } from '@ohos/common/src/main/ets/entity/Viewdrdc';
+class ViewdrdcModel {
+
+  // 查询
+  async queryExport(data:Partial<Viewdrdc>): Promise<Viewdrdc[]> {
+    let res = await SQLiteContext.with(ViewdrdcDao).getDrdc(data)
+    return res;
+  }
+
+  async queryAll(): Promise<Viewdrdc[]> {
+    let res = await SQLiteContext.with(ViewdrdcDao).queryAll()
+    return res;
+  }
+
+}
+
+const drModel = new ViewdrdcModel()
+
+export default drModel
\ No newline at end of file

entry/src/main/ets/model/WzcrkModel.ets

-import { WzcrkDao, Wzcrk, SQLiteContext  } from '@ohos/common'
+import { WzcrkDao, Wzcrk, SQLiteContext } from '@ohos/common'
 import { uuid } from '@ohos/common/src/main/ets/utils/util';
 import wzcrkmxModel from './WzcrkmxModel';
 import { Logger } from '@ohos/common/src/main/ets/utils/Logger';
@@ -15,15 +15,15 @@ class WzcrkModel {
 
       // 获取子单数量总和赋给主单
       // @ts-ignore
-      const pzsl = data[index].jhmx.map(v =>Number(v.pmsl)).reduce((a,b) => a+b, 0)
+      const pzsl = data[index].jhmx.map(v => Number(v.pmsl)).reduce((a, b) => a + b, 0)
       // @ts-ignore
-      const crksl = data[index].jhmx.map(v =>Number(v.crksl)).reduce((a,b) => a+b, 0)
+      const crksl = data[index].jhmx.map(v => Number(v.crksl)).reduce((a, b) => a + b, 0)
 
       wzcrk.guid = uid
       wzcrk.pzsl = pzsl
       wzcrk.crksl = crksl
       // @ts-ignore
-      const wzcrkmx = data[index].jhmx.map((v =>{
+      const wzcrkmx = data[index].jhmx.map((v => {
         return {
           ...v,
           guid: uuid(),
@@ -36,6 +36,7 @@ class WzcrkModel {
         }
       }));
 
+      Logger.info(this, '输出插入数据：'+ index + '_' + wzcrk.kfdm);
       await SQLiteContext.with(WzcrkDao).insert(wzcrk)
       await wzcrkmxModel.set(wzcrkmx)
     }
@@ -43,7 +44,7 @@ class WzcrkModel {
   }
 
   // 查询
-  async query(data:Partial<Wzcrk>): Promise<Wzcrk[]> {
+  async query(data: Partial<Wzcrk>): Promise<Wzcrk[]> {
     let res = await SQLiteContext.with(WzcrkDao).getWzcrk(data)
     return res;
   }
@@ -55,18 +56,18 @@ class WzcrkModel {
 
 
   /*获取物资出入库*/
-  async queryWzcrklist(sql?: string):Promise<Wzcrk[]> {
+  async queryWzcrklist(sql?: string): Promise<Wzcrk[]> {
     let res = await SQLiteContext.with(WzcrkDao).selectWzcrkList(sql);
     return res;
   }
 
-  async updateWzcrkWczt(guid: string, wczt: string):Promise<number> {
+  async updateWzcrkWczt(guid: string, wczt: string): Promise<number> {
     let res = await SQLiteContext.with(WzcrkDao).updateWczt(guid, wczt)
     return res;
   }
 
   // 更新单据信息
-  async updateWcztByData(guid: string, data: Partial<Wzcrk>):Promise<number> {
+  async updateWcztByData(guid: string, data: Partial<Wzcrk>): Promise<number> {
     let res = await SQLiteContext.with(WzcrkDao).updateWcztByData(guid, data)
     return res;
   }
@@ -76,6 +77,7 @@ class WzcrkModel {
     await SQLiteContext.with(WzcrkDao).clearTable()
   }
 }
+
 const wzcrkModel = new WzcrkModel()
 
 export default wzcrkModel
\ No newline at end of file

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

@@ -7,6 +7,10 @@ import { WzinClass } from './Wzin.data'
 import promptAction from '@ohos.promptAction';
 import { SetStatusDialog } from '../../../view/SetStatusDialog/SetStatusDialog';
 import { ExportOrderDialog } from '../../../view/ExportOrderDialog/ExportOrderDialog';
+import ViewdrdcModel from '../../../model/ViewdrdcModel';
+import { ViewdrdcDao } from '@ohos/common/src/main/ets/db/dao/ViewdrdcDao';
+import defHttp from '@ohos/common/src/main/ets/utils/HttpUtil';
+import { importData } from './wzIn.api';
 
 @Extend(Button) function bottomBtnSty() {
   .borderWidth(1)
@@ -65,8 +69,7 @@ export struct WzInPage {
   async getWzcrkList(qzh?: number, wczt?: string) {
     Logger.info('出入库传入参数>>:', JSON.stringify(this.searchData))
     this.dataSource = []
-    const res = await wzcrkModel.query({ crklx: "2", pzh: Number(this.pzh) , wczt: this.wczt, sjlx: this.currentIndex === 0 ? "导入" : "临时收物" })
-    // const res = await wzcrkModel.query({ crklx: "2" })
+    const res = await wzcrkModel.query({ crklx: "2", pzh: Number(this.searchData.pzh)  , wczt: this.searchData.wczt, sjlx: this.currentIndex === 0 ? "导入" : "临时收物" })
     Logger.info('出入库数据>>:', JSON.stringify(res))
     Logger.info('出入库数据长度>>:', JSON.stringify(res.length))
     res.forEach(element => {
@@ -160,24 +163,58 @@ export struct WzInPage {
   }
 
   onExportSubmit() {
-    // let newObj = {
-    //   cbdwdm: filterData.ckdwguid,
-    //   ckkfdm: filterData.KFDM,
-    //   ...filterData,
-    //   scjid: getClientId(),
-    //   cjmc: '普华',
-    //   bbh: this.sysConfig.bbh,
-    //   imei: getDevice().imei,
-    //   model: getDevice().model,
-    //   vendor: getDevice().vendor,
-    //   dcsj: date,
-    //   pzmx: ItemData
-    // }
-    this.checkedList.forEach(element => {
-      this.dataSource.find(i => i.guid == element)
-
+    this.checkedList.forEach(async element => {
+      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '已完成', pzlx: '14'})
+      const jhguidArr = res.map((item) => item.guid)
+      Logger.info('导出数据0：', JSON.stringify(jhguidArr))
+      if (jhguidArr && jhguidArr.length > 0) {
+        const newArr = [...new Set(jhguidArr)]
+        Logger.info('导出数据1：', JSON.stringify(newArr))
+        const exportData = newArr.map((item) => {
+          let newObj = {}
+          let ItemData = []
+          res.forEach((Item) => {
+            if (item == Item.guid) {
+              ItemData.push({
+                jhmxguid: Item.jhmxguid,
+                hwh: Item.hwh,
+                pmdmcode: Item.pmdmcode,
+                wzdm: Item.wzdm,
+                pzsl: Item.pzsl || 0,
+                sjsl: Item.crksl || 0
+              })
+            }
+          })
+          Logger.info('导出数据2：', JSON.stringify(ItemData))
+          const [filterData] = res.filter((fItem) => fItem
+            .guid == item)
+          Logger.info('>>>>>>>kkkll:' + JSON.stringify(filterData))
+          if (filterData) {
+            newObj = {
+              cbdwdm: filterData.ckdwguid,
+              ckkfdm: filterData.kfdm,
+              ...filterData,
+              scjid: "863576927543400,863576927543400",
+              cjmc: "普华",
+              imei: "863576927543400,863576927543400",
+              model: "ax6737_65_n",
+              vendor: "alps",
+              dcsj: "2024年01月20日",
+              pzmx: ItemData
+            }
+          }
+          return newObj
+        })
+        Logger.info('导出数据3：', JSON.stringify(exportData))
+        const kkkk = {
+          pzzbJson: exportData,
+          crklx: '11111CRKLX2',
+          gznd: '2023',
+          jsdwguid: 1,
+        }
+        await importData(kkkk)
+      }
     })
-    Logger.info('--------覆盖合并-------：' + JSON.stringify(this.dataSource), JSON.stringify(this.checkedList))
     promptAction.showToast({
       message: '导出'
     })

entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/AddWzin.ets

 import gldwModel from '../../../../model/GldwModel'
 import kfModel from '../../../../model/KfModel'
 import { renderPzlx, renderSzlx, renderZmlx, WzinClass } from '../Wzin.data'
+
 @Entry
 @Component
   // 物资信息
 export struct PzInfo {
-  @State kfmc: string = ''
-  @State fwgldw: string = ''
-  @State swgldw: string = ''
-  @ObjectLink wzcrk: WzinClass
+  // @State kfmc: string = ''
+  // @State fwgldw: string = ''
+  // @State swgldw: string = ''
 
-  arr = [{ title: "凭证类型", key: 'pzlx', enabled: false,type:'select' },
-    { title: "凭证号", key: 'pzh', enabled: false,type:'input'  },
-    { title: "库房", key: 'kfguid', enabled: false,type:'input' },
-    { title: "收支类型", key: 'pzszlx', enabled: false,type:'input' },
-    { title: "运单号", key: 'ydh', enabled: true,type:'input' },
-    { title: "发物管理单位", key: 'fwgldwdm', enabled: false,type:'input' },
-    { title: "收物管理单位", key: 'swgldwdm', enabled: false,type:'input' },
-    { title: "备注", key: 'dec', enabled: true,type:'input' }
+  arr = [{ title: "凭证类型", key: 'pzlx', enabled: false, type: 'input' },
+    { title: "凭证号", key: 'pzh', enabled: false, type: 'input' },
+    { title: "收支类型", key: 'pzszlx', enabled: false, type: 'input' },
+    { title: "库房", key: 'kfguid', enabled: true, type: 'select', options:[] },
+    { title: "货位号", key: 'hwh', enabled: true, type: 'select' },
+    { title: "运单号", key: 'ydh', enabled: true, type: 'input' },
+    { title: "发物管理单位", key: 'fwgldwdm', enabled: false, type: 'select' },
+    { title: "收物管理单位", key: 'swgldwdm', enabled: false, type: 'select' },
+    { title: "账目类型", key: 'zmlx', enabled: false, type: 'select'},
+    { title: "备注", key: 'dec', enabled: true, type: 'input' }
   ]
 
-  aboutToAppear(){
+  aboutToAppear() {
     this.getData()
   }
 
   async getData() {
-    const res = await kfModel.query({guid: this.wzcrk.kfguid})
-    this.kfmc = res[0].kfmc ?? ''
+    // 获取库房列表
+    const kfList = await kfModel.query({ })
 
-    const res1 = await gldwModel.queryByData({dwdm:this.wzcrk.fwgldwdm})
-    this.fwgldw = res1[0].dwfh ?? ''
+    this.arr[this.arr.findIndex(v => v.key == 'kfguid')].options = kfList.map(v => {
+      return {
+        value:v.kfmc,
+        id:v.guid
+      }
+    })
 
-    const res2 = await gldwModel.queryByData({dwdm:this.wzcrk.swgldwdm})
-    this.swgldw = res2[0].dwfh ?? ''
+    //
+    // const res1 = await gldwModel.queryByData({ dwdm: this.wzcrk.fwgldwdm })
+    // this.fwgldw = res1[0].dwfh ?? ''
+    //
+    // const res2 = await gldwModel.queryByData({ dwdm: this.wzcrk.swgldwdm })
+    // this.swgldw = res2[0].dwfh ?? ''
   }
 
-
-
-  build(){
-    Column(){
+  build() {
+    Column() {
       Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) {
         Divider()
           .vertical(true)
@@ -50,29 +58,45 @@ export struct PzInfo {
         Text("凭证信息")
           .fontSize(16)
       }.height('8%')
-      ForEach(this.arr,(item) => {
+
+      ForEach(this.arr, (item) => {
         Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center }) {
           Text(item.title)
             .fontSize(14)
             .width("30%")
             .height(40)
             .fontColor($r("app.color.item_color_black"))
-          TextInput({ text:"1111" })
-            .enterKeyType(EnterKeyType.Search)
-            .borderColor("#454545")
-            .borderRadius(5)
-            .width("70%")
-            .height(40)
-            .padding(10)
-            .borderColor('#bcc5d7')
-            .borderWidth(1)
-            .backgroundColor(item.enabled ? '#fff' : "app.color.disabledColor")
-            .enabled(item.enabled)
-            .onChange((value: string) => {
-              if(item.enabled) {
-                this.wzcrk[item.key] = value
-              }
-            })
+
+          if (item.type == 'select') {
+            Select([])
+              .value(`请选择${item.title}`)
+              .width(230)
+              .borderWidth(1)
+              .borderRadius(5)
+              .borderColor($r("app.color.rank_secondary_border"))
+              .onSelect((index: number, value?: string) => {
+                console.log("选择库房", value)
+              })
+          }
+
+          if (item.type == 'input') {
+            TextInput({ text: "1111" })
+              .enterKeyType(EnterKeyType.Search)
+              .borderColor("#454545")
+              .borderRadius(5)
+              .width("70%")
+              .height(40)
+              .padding(10)
+              .borderColor('#bcc5d7')
+              .borderWidth(1)
+              .backgroundColor(item.enabled ? '#fff' : "app.color.disabledColor")
+              .enabled(item.enabled)
+              .onChange((value: string) => {
+                if (item.enabled) {
+                  // this.wzcrk[item.key] = value
+                }
+              })
+          }
         }.padding("10vp")
       })
     }.backgroundColor('#fff')

entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/PzInfo.ets

@@ -35,10 +35,10 @@ export struct PzInfo {
   }
 
 
-   handleText(key: string): string {
+  handleText(key: string): string {
     switch (key) {
       case 'pzlx':
-      return renderPzlx(this.wzcrk.pzlx)
+        return renderPzlx(this.wzcrk.pzlx)
 
       case 'pzszlx':
         return renderSzlx(this.wzcrk.pzszlx)
@@ -47,7 +47,7 @@ export struct PzInfo {
         return renderZmlx(this.wzcrk.zmlx)
 
       case 'kfguid':
-       return this.kfmc
+        return this.kfmc
 
       case 'fwgldwdm':
         return this.fwgldw

entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/PzInfo2.ets

+import { Logger } from '@ohos/common/src/main/ets/utils/Logger'
+import gldwModel from '../../../../model/GldwModel'
+import kfModel from '../../../../model/KfModel'
+import { renderPzlx, renderSzlx, renderZmlx, WzinClass } from '../Wzin.data'
+
+// @Observed
+class Options {
+  value:'string'
+  id: string | number
+}
+// @Observed
+class Form {
+  title: string
+  key: string
+  enabled:boolean
+  type: 'input' | 'select'
+  options?: Options[]
+}
+
+@Entry
+@Component
+  // 物资信息
+export struct PzInfo {
+  // @State kfmc: string = ''
+  // @State fwgldw: string = ''
+  // @State swgldw: string = ''
+
+  @State Form: form[] = []
+
+
+  arr = [{ title: "凭证类型", key: 'pzlx', enabled: false, type: 'input' },
+    { title: "凭证号", key: 'pzh', enabled: false, type: 'input' },
+    { title: "收支类型", key: 'pzszlx', enabled: false, type: 'input' },
+    { title: "库房", key: 'kfguid', enabled: true, type: 'select' },
+    { title: "货位号", key: 'hwh', enabled: true, type: 'select'},
+    { title: "运单号", key: 'ydh', enabled: true, type: 'input' },
+    { title: "发物管理单位", key: 'fwgldwdm', enabled: false, type: 'select' },
+    { title: "收物管理单位", key: 'swgldwdm', enabled: false, type: 'select' },
+    { title: "账目类型", key: 'zmlx', enabled: false, type: 'select'},
+    { title: "备注", key: 'dec', enabled: true, type: 'input' }
+  ]
+
+  aboutToAppear() {
+    this.getData()
+  }
+
+  async getData() {
+    // 获取库房列表
+    const kfList = await kfModel.query({})
+
+    Logger.info('库房列表>>', JSON.stringify(kfList))
+
+    this.arr.forEach(i => {
+      this.form
+    })
+
+    // this.arr[this.arr.findIndex(v => v.key == 'kfguid')].options = kfList.map(v => {
+    //   return {
+    //     value:v.kfmc,
+    //     id:v.guid
+    //   }
+    // })
+
+    Logger.info('库房列表>>111', JSON.stringify( this.arr[this.arr.findIndex(v => v.key == 'kfguid')].options))
+
+    //
+    // const res1 = await gldwModel.queryByData({ dwdm: this.wzcrk.fwgldwdm })
+    // this.fwgldw = res1[0].dwfh ?? ''
+    //
+    // const res2 = await gldwModel.queryByData({ dwdm: this.wzcrk.swgldwdm })
+    // this.swgldw = res2[0].dwfh ?? ''
+  }
+
+  build() {
+    Column() {
+      Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) {
+        Divider()
+          .vertical(true)
+          .height(14)
+          .strokeWidth(3)
+          .color('#19ac88')
+          .opacity(0.6)
+          .margin({ left: 8, right: 8 })
+        Text("凭证信息")
+          .fontSize(16)
+      }.height('8%')
+
+      ForEach(this.arr, (item) => {
+        Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center }) {
+          Text(item.title)
+            .fontSize(14)
+            .width("30%")
+            .height(40)
+            .fontColor($r("app.color.item_color_black"))
+
+          if (item.type == 'select') {
+            Select(item.options)
+              .value(`请选择${item.title}`)
+              .width(230)
+              .borderWidth(1)
+              .borderRadius(5)
+              .borderColor($r("app.color.rank_secondary_border"))
+              .onSelect((index: number, value?: string) => {
+                console.log("选择库房", value)
+              })
+          }
+
+          if (item.type == 'input') {
+            TextInput({ text: "1111" })
+              .enterKeyType(EnterKeyType.Search)
+              .borderColor("#454545")
+              .borderRadius(5)
+              .width("70%")
+              .height(40)
+              .padding(10)
+              .borderColor('#bcc5d7')
+              .borderWidth(1)
+              .backgroundColor(item.enabled ? '#fff' : "app.color.disabledColor")
+              .enabled(item.enabled)
+              .onChange((value: string) => {
+                if (item.enabled) {
+                  // this.wzcrk[item.key] = value
+                }
+              })
+          }
+        }.padding("10vp")
+      })
+    }.backgroundColor('#fff')
+  }
+}
\ No newline at end of file

entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzinDetail.ets

@@ -75,6 +75,7 @@ struct WzinDetail {
           TabContent() {
             Column() {
               PzInfo({ wzcrk: this.wzcrk })
+              // PzInfo()
             }.width("100%")
           }.tabBar(this.TabBuilder(0, '凭证信息'))
 

entry/src/main/ets/pages/metailmange/WzInPage/wzIn.api.ts

+import defHttp from "@ohos/common/src/main/ets/utils/HttpUtil"
+
+enum Api {
+  importData = '/api/integrate/knzy/importData'
+}
+
+// 导出出入库单据
+export const importData = (data)  => defHttp.post({url: Api.importData, data})
\ No newline at end of file

entry/src/main/ets/pages/package/Pick.ets

+import { SQLiteContext,ViewdrdcDao,Logger } from '@ohos/common'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
 import { TitleBar } from '../../view/title/TitleBar'
 
@@ -18,10 +19,10 @@ export struct Pick {
 
   build() {
     Column() {
-      Flex({ direction: FlexDirection.Column, alignItems:ItemAlign.Center }) {
+      Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center }) {
         TitleBar({ title: "取件" })
         Row() {
-          Flex({justifyContent:FlexAlign.Center}){
+          Flex({ justifyContent: FlexAlign.Center }) {
             Search({ placeholder: '请输入包裹信息', controller: this.controller })
               .height(40)
               .backgroundColor('#F5F5F5')
@@ -42,7 +43,12 @@ export struct Pick {
 
         Row() {
           Flex({ justifyContent: FlexAlign.SpaceAround }) {
-            Button("打印面单").CommonButtonStyle()
+            Button("打印面单").CommonButtonStyle().onClick(() => {
+              Logger.info(this,'输出数据:666666666666');
+              SQLiteContext.with(ViewdrdcDao).queryAll().then(res=>{
+                Logger.info(this,'输出数据:' + JSON.stringify(res));
+              })
+            })
             Button("扫码取件").CommonButtonStyle()
             Button("手动取件").CommonButtonStyle()
           }

entry/src/main/ets/pages/sub_systemMaintenance/DataSynchronism/DataSynchronism.ets

@@ -159,6 +159,9 @@ export struct Pmhx {
             // 在这里执行对每个元素的操作
             return {
               ...row,
+              pzzbguid: row.jhguid,
+              ckdwguid: row.cbdwdm,
+              kfdm: row.ckkfdm,
               sjlx: "导入",
               wczt: "未完成",
             };