所有的临时全写完了

common/src/main/ets/bean/dto/RecommendHwDto.ts.ets

@@ -88,5 +88,25 @@ export interface WzmxDto {
 
 
 export interface PzhDto {
-  pzh: number
+  pzh: string
+}
+
+export interface SelectZsDto {
+  wzcrkguid: string,
+  pzsl: number,
+  crksl: number
+}
+
+export interface TestRkHwWzDto {
+  guid: string,
+  hwh: string,
+  pmdmcode: string,
+  hwsl: number,
+  hjguid: string,
+  hwzt: string,
+  hwxgsj: string,
+  gldwguid: string,
+  kfguid: string,
+  zmlx: string,
+  kfdm: string
 }
\ No newline at end of file

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

 import relationalStore from '@ohos.data.relationalStore';
-import { DjcxDto, PzhDto, PzMxDto, WzmxDto } from '../../bean/dto/RecommendHwDto.ts';
+import { DjcxDto, PzhDto, PzMxDto, SelectZsDto, TestRkHwWzDto, WzmxDto } from '../../bean/dto/RecommendHwDto.ts';
 import { WzcrkDetailDto } from '../../bean/dto/WzcrkMxRefWzDto';
 import { Wzcrk } from '../../entity/Wzcrk';
 import { Wzcrkmx } from '../../entity/Wzcrkmx';
@@ -84,14 +84,10 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
   /**
    * 更新凭证列表中的总数量和日扫描数量
    */
-  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)
+  async updateZs(params) {
+    let val_sql = NativeSql.updateZsSql(params);
+    let db = await this.futureDb;
+    return await db.executeSql(val_sql)
   }
 
 
@@ -340,9 +336,87 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
 
   toPzh(cursor: relationalStore.ResultSet): PzhDto {
     let info: PzhDto = {
-      pzh: cursor.getLong(cursor.getColumnIndex('pzh')),
+      pzh: cursor.getString(cursor.getColumnIndex('pzh')),
+    };
+    return info;
+  }
+
+  async insertPz(params) {
+    let val_sql = NativeSql.insertPzSql(params);
+    let db = await this.futureDb;
+    return await db.executeSql(val_sql)
+  }
+
+
+  async selectZs(params) : Promise<SelectZsDto[]> {
+    try {
+      let val_sql = NativeSql.selectZsSql(params);
+      let db = await this.futureDb;
+      let rs = await db.querySql(val_sql);
+      let items = []
+      if (rs.goToFirstRow()) {
+        do {
+          items.push(this.toSelectZs(rs))
+        } while (rs.goToNextRow())
+      }
+      Logger.info(this, 'queryAll items22=' + JSON.stringify(items))
+      return items;
+    } catch (e) {
+      throw new Error('[查询异常]|' + e)
+    }
+  }
+
+  toSelectZs(cursor: relationalStore.ResultSet): SelectZsDto {
+    let info: SelectZsDto = {
+      wzcrkguid: cursor.getString(cursor.getColumnIndex('wzcrkguid')),
+      pzsl: cursor.getLong(cursor.getColumnIndex('pzsl')),
+      crksl: cursor.getLong(cursor.getColumnIndex('crksl'))
     };
     return info;
   }
 
+
+  // 验证当前货位收否有物资(入库)
+  async testRkHwWz(params) : Promise<TestRkHwWzDto[]> {
+    try {
+      let val_sql = NativeSql.testRkHwWzSql(params);
+      let db = await this.futureDb;
+      let rs = await db.querySql(val_sql);
+      let items = []
+      if (rs.goToFirstRow()) {
+        do {
+          items.push(this.toTestRkHwWz(rs))
+        } while (rs.goToNextRow())
+      }
+      Logger.info(this, 'queryAll items22=' + JSON.stringify(items))
+      return items;
+    } catch (e) {
+      throw new Error('[查询异常]|' + e)
+    }
+  }
+
+  toTestRkHwWz(cursor: relationalStore.ResultSet): TestRkHwWzDto {
+    let info: TestRkHwWzDto = {
+      guid: cursor.getString(cursor.getColumnIndex('guid')),
+      hwh: cursor.getString(cursor.getColumnIndex('hwh')),
+      pmdmcode: cursor.getString(cursor.getColumnIndex('pmdmcode')),
+      hwsl: cursor.getLong(cursor.getColumnIndex('hwsl')),
+      hjguid: cursor.getString(cursor.getColumnIndex('hjguid')),
+      hwzt: cursor.getString(cursor.getColumnIndex('hwzt')),
+      hwxgsj: cursor.getString(cursor.getColumnIndex('hwxgsj')),
+      gldwguid: cursor.getString(cursor.getColumnIndex('gldwguid')),
+      kfguid: cursor.getString(cursor.getColumnIndex('kfguid')),
+      zmlx: cursor.getString(cursor.getColumnIndex('zmlx')),
+      kfdm: cursor.getString(cursor.getColumnIndex('kfdm'))
+    };
+    return info;
+  }
+
+  async updateRkWz(params) {
+    let val_sql = NativeSql.updateRkWzSql(params);
+    let db = await this.futureDb;
+    return await db.executeSql(val_sql)
+  }
+
+
 }
\ No newline at end of file

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

@@ -105,7 +105,7 @@ WHERE
   // 不存在物资,进行物资新增
   static insertWzSql(params): string {
     const sql =
-      `insert into tab_bzgl_knzy_app_hwb (guid, hwh, pmdmcode, hwsl, hjguid, hwzt) values ('${params.guid}', '${params.hwh}', '${params.pmdmcode}', '${params.hwsl}', '${params.hjguid}','11111111SF1')`
+      `insert into tab_bzgl_knzy_app_hwb (guid, hwh, pmdmcode, hwsl, hjguid, hwzt) values ('${params.guid}', '${params.hwh}', '${params.pmdmcode}', ${params.hwsl}, '${params.hjguid}','11111111SF1')`
     return sql
   }
   // -- -- - 物资列表详情
@@ -141,7 +141,42 @@ WHERE
   // 临时凭证号查询
   static getPzhSql(params): string {
     const sql =
-      `select 'LS' || (count(1) + 1) pzh from tab_bzgl_knzy_app_wzcrk where sjlx = '${params.sjlx}' and pzlx = ${params.pzlx}`
+      `select 'LS' || (count(1) + 1) pzh from tab_bzgl_knzy_app_wzcrk where sjlx = '${params.sjlx}' and pzlx = '${params.pzlx}'`
+    return sql
+  }
+
+  // -- - 物资出入库表：
+  // 物资出入盘库
+  // 物资出入库表：
+  static insertPzSql(params): string {
+    const sql =
+      `insert into tab_bzgl_knzy_app_wzcrk (guid, gznd, crkrq, ckdwguid, czr, qrzt, crklx, pzzbguid, pzlx, pzh, sjlx, pzszlx, sfdw, wczt, kfdm, rkkfdm,ydh,dec,fwgldwdm,swgldwdm,kfguid,zmlx) values ('${(params.guid)}', '${(params.gznd)}', '${(params.time)}', '${(params.cbdwdm)}', '${(params.czr)}', '${(params.qrzt)}', '${(params.crklx)}', '${(params.jhguid)}', '${(params.pzlx)}', '${(params.pzh)}', '${(params.sjlx)}', '${(params.pzszlx)}', '${(params.sfdw)}','未完成','${(params.kfdm)}','${(params.rkkfdm)}','${(params.ydh)}','${(params.dec)}', '${(params.fwgldwdm)}', '${(params.swgldwdm)}', '${(params.kfguid)}', '${(params.zmlx)}')`;
+    return sql
+  }
+
+  // 优化凭证列表显示速度，在出入库主表中加入pzs integex和crkalinteaer 两个学段存放凭证的总数量利
+  // 凭证列表展示时直接读取数据，修改pzh《凭证号)字段类型为integer
+  // 凭证导入、退出或保布时操作，导出不管
+  // --求某一凭证的总激量和扫描总 及量
+  static selectZsSql(params) {
+    return `select wzcrkguid, sum(case when ifnull(pzmxguid,'')<>'' then pzsl else 0 end) pzsl, sum(ifnull(crksl,0)) crksl from tab_bzgl_knzy_app_wzcrkmx where wzcrkguid = '${params.wzcrkguid}'`
+  }
+  // 更新凭证列表中的总数量和日描总数量
+  static updateZsSql(params) {
+    return `update tab_bzgl_knzy_app_wzcrk set pzsl=${params.pzsl}, crksl=${params.crksl} where guid = '${params.wzcrkguid}'`
+  }
+
+  // 验证当前货位收否有物资(入库)
+  static testRkHwWzSql(params) {
+    const sql =
+      `select * from (select hw.*,qy.kfdm kfdm from tab_bzgl_knzy_app_hwb hw left join tab_bzgl_knzy_app_hjb hj on hj.guid = hw.hjguid left join tab_bzgl_knzy_app_qyb qy on qy.guid = hj.qyguid
+      ) where kfdm = '${(params.kfdm)}' and ( pmdmcode = '${(params.pmdmcode)}' or pmdmcode = '' or pmdmcode is null ) and hwh = '${(params.hwh)}'  `
+    return sql
+  }
+
+  static updateRkWzSql(params) {
+    const sql =
+      `update tab_bzgl_knzy_app_hwb set hwsl = ifnull(hwsl,0) + ${params.hwsl} , pmdmcode = '${(params.pmdmcode)}'  where guid = '${(params.hwguid)}'  `
     return sql
   }
 

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

@@ -39,7 +39,7 @@ export interface Wzcrk {
   /**
    * 凭证号
    */
-  pzh: number,
+  pzh: number | string,
   /**
    * 数据类型 导入/新建
    */

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

@@ -59,6 +59,16 @@ class WzcrkModel {
   //   return res;
   // }
 
+  async insertPz(params) {
+    let res = await SQLiteContext.with(WzcrkDao).insertPz(params)
+    return res;
+  }
+
+  async selectZs(params) {
+    let res = await SQLiteContext.with(WzcrkDao).selectZs(params)
+    return res;
+  }
+
 
   /*获取物资出入库*/
   async queryWzcrklist(sql?: string): Promise<Wzcrk[]> {
@@ -90,6 +100,21 @@ class WzcrkModel {
     return res
   }
 
+  async updateZs(params) {
+    let res = await SQLiteContext.with(WzcrkDao).updateZs(params)
+    return res
+  }
+
+  async testRkHwWz(params) {
+    let res = await SQLiteContext.with(WzcrkDao).testRkHwWz(params)
+    return res
+  }
+
+  async updateRkWz(params) {
+    let res = await SQLiteContext.with(WzcrkDao).updateRkWz(params)
+    return res
+  }
+
   // 获取单据明细（单据匹配）
   async getDjcx() {
     let res = await SQLiteContext.with(WzcrkDao).getDjcx()

entry/src/main/ets/pages/metailmange/Common/Wzcrk.data.ets

@@ -40,7 +40,7 @@ export class WzClass {
   /**
    * 凭证号
    */
-  pzh: number
+  pzh: string | number
   /**
    * 数据类型 导入/新建
    */
@@ -101,33 +101,38 @@ export class WzClass {
    * 备注
    */
   dec: string
+  /**
+   * 货位号
+   */
+  hwh: string
 
   constructor(data: {
-    gznd: string;
-    crkrq: string;
-    ckdwguid: string;
-    czr: string;
-    qrzt: string;
-    crklx: string;
-    pzzbguid: string;
-    pzlx: string;
-    sjlx: string;
-    pzszlx: string;
-    sfdw: string;
-    wczt: string;
-    kfdm: string;
-    rkkfdm: string;
-    ydh: string;
-    fwgldwdm: string;
-    swgldwdm: string;
-    kfguid: string;
-    zmlx: string;
-    bdguid: string;
-    dec: string;
+    gznd?: string;
+    crkrq?: string;
+    ckdwguid?: string;
+    czr?: string;
+    qrzt?: string;
+    crklx?: string;
+    pzzbguid?: string;
+    pzlx?: string;
+    sjlx?: string;
+    pzszlx?: string;
+    sfdw?: string;
+    wczt?: string;
+    kfdm?: string;
+    rkkfdm?: string;
+    ydh?: string;
+    fwgldwdm?: string;
+    swgldwdm?: string;
+    kfguid?: string;
+    zmlx?: string;
+    bdguid?: string;
+    dec?: string;
     guid?: string;
-    pzh?: number;
+    pzh?: number | string;
     pzsl?: number;
     crksl?: number;
+    hwh?: string
   }) {
     this.guid = data.guid || '';
     this.gznd = data.gznd || '';
@@ -154,6 +159,7 @@ export class WzClass {
     this.zmlx = data.zmlx || '';
     this.bdguid = data.bdguid || '';
     this.dec = data.dec || '';
+    this.hwh = data.hwh || ''
   }
 }
 
@@ -251,38 +257,46 @@ export class WzmxClass {
 // 物资明细
 @Observed
 export class historicalInformationClass {
-
-  wzpm: string
-  pmdmsix: string
-  pmdmcode: string
-  hxmc: string
-  pzsl: number
-  crksl: number
-  hwh: string
-  mxguid: string
-  pzmxguid: string
+  guid?: string
+  wzcrkguid?: string
+  wzpm?: string
+  pmdmsix?: string
+  pmdmcode?: string
+  pmdm?: string
+  hxmc?: string
+  pzsl?: number
+  crksl?: number
+  hwh?: string
+  mxguid?: string
+  pzmxguid?: string
   currentModel?: boolean
   srsl?: number
   hwsl?: number
 
 
   constructor(data: {
-    wzpm: string
-    pmdmsix: string
-    pmdmcode: string
-    hxmc: string
-    pzsl: number
-    crksl: number
-    hwh: string
-    mxguid: string
-    pzmxguid: string
+    guid?: string
+    wzcrkguid?: string
+    wzpm?: string
+    pmdmsix?: string
+    pmdmcode?: string
+    pmdm?: string
+    hxmc?: string
+    pzsl?: number
+    crksl?: number
+    hwh?: string
+    mxguid?: string
+    pzmxguid?: string
     currentModel?: boolean
     srsl?: number
     hwsl?: number
   }) {
+    this.guid = data.guid
+    this.wzcrkguid = data.wzcrkguid
     this.wzpm = data.wzpm
     this.pmdmsix = data.pmdmsix
     this.pmdmcode = data.pmdmcode
+    this.pmdm = data.pmdm
     this.hxmc = data.hxmc
     this.pzsl = data.pzsl
     this.crksl = data.crksl

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

@@ -59,7 +59,7 @@ export struct WzInPage {
     pzh: this.pzh,
     page: this.page,
     rows: this.rows,
-    sjlx: this.currentIndex === 0 ? "导入" : "新建",
+    sjlx: this.currentIndex === 0 ? "导入" : "临时收物",
     wczt: "未完成"
   }