Merge remote-tracking branch 'origin/master'

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

@@ -152,32 +152,25 @@ export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
    * 更新单据状态
    */
   async updateWcztmxByData(guid: string, data: Partial<Wzcrkmx>): Promise<number> {
-    // const valueBucket = {};
-    // for (const [key, value] of Object.entries(data)) {
-    //   valueBucket[key] = value
-    // }
-    // valueBucket[this.getColumnId()] = undefined;
-    // Logger.error(this, '更新的BUCKET' + JSON.stringify(valueBucket));
-    // let wp = this.getPredicates()
-    // wp.equalTo('guid', data.guid);
-    // return this.updateData(valueBucket, wp);
-    //return db.update(valueBucket,wp);
-    // return this.update(data as Wzcrkmx)
-    const valueBucket = {
-      CRKSL: 20
-    };
+    const valueBucket = {};
 
-    // for (const [key, value] of Object.entries(data)) {
-    //   if(value) {
-    //     valueBucket[key] = value
-    //   }
-    // }
+    for (const [key, value] of Object.entries(data)) {
+        if(value) {
+          valueBucket[key] = value
+        }
+    }
 
     let wp = this.getPredicates()
     wp.equalTo('GUID', guid)
     return this.updateData(valueBucket, wp)
   }
 
+  async  updateWcztBySql(sql) {
+    Logger.info('sql>>', sql)
+    let db = await this.futureDb;
+    await db.executeSql(sql)
+  }
+
   async queryByCrkGuid(wzcrkguid: string, wzpm?: string): Promise<WzcrkMxRefWzDto[]> {
     try {
       let val_sql = NativeSql.getSqlByCrkmx(wzcrkguid, wzpm);

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

@@ -6,7 +6,7 @@ export class NativeSql {
    */
   static getSqlByCrkmx(wzcrkguid: string, wzpm?: string): string {
     let sql_val = `SELECT
-     s2.guid, s2.xh, s2.hxmc, s2.pmdmsix,s2.pmdmten, s2.wzpm, s1.pzmxguid,
+     s1.guid, s2.xh, s2.hxmc, s2.pmdmsix,s2.pmdmten, s2.wzpm, s1.pzmxguid,
      s1.wzcrkguid,s1.pzsl,s1.hwh,s1.crksl FROM TAB_BZGL_KNZY_APP_WZCRKMX s1
      LEFT JOIN TAB_XTWH_JCSJ_BZHX s2 on s1.PMDMCODE = s2.PMDMTEN where s1.WZCRKGUID='${wzcrkguid}'`;
     if (wzpm) {

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

@@ -7,6 +7,7 @@ import { Logger } from '@ohos/common/src/main/ets/utils/Logger';
 class WzcrkModel {
   // 添加
   async set(data: Wzcrk[]) {
+    let index = 0
 
     for (let index = 0; index < data.length; index++) {
       const uid = uuid();
@@ -22,11 +23,14 @@ class WzcrkModel {
       wzcrk.guid = uid
       wzcrk.pzsl = pzsl
       wzcrk.crksl = crksl
+
+      // @ts-ignore
+      Logger.info('wzcrkmxwzcrkmx',JSON.stringify(data[index].jhmx))
       // @ts-ignore
       const wzcrkmx = data[index].jhmx.map((v => {
         return {
           ...v,
-          guid: uuid(),
+          // guid: index++,
           wzcrkguid: uid,
           gznd: wzcrk.gznd,
           // @ts-ignore
@@ -77,12 +81,6 @@ class WzcrkModel {
     return res;
   }
 
-  // 更新单据信息
-  async updateWcztBySql(guid:string, crksl:number){
-    const tableName = SQLiteContext.with(WzcrkDao).getTableName()
-    const sql = `update ${tableName} set crksl = ${crksl} where guid = ${guid}`
-    let res = await SQLiteContext.with(WzcrkDao).updateWcztBySql(sql)
-  }
 
   // 清空表
   async clear() {

entry/src/main/ets/model/WzcrkmxModel.ets

-import { WzcrkmxDao, WzcrkDao, Wzcrk, Wzcrkmx, SQLiteContext  } from '@ohos/common'
+import { WzcrkmxDao, WzcrkDao, Wzcrk, Wzcrkmx, SQLiteContext, Logger  } from '@ohos/common'
 import { WzcrkMxRefWzDto } from '@ohos/common/src/main/ets/bean/dto/WzcrkMxRefWzDto'
 
 // 物资出库入库
@@ -27,11 +27,18 @@ class WzcrkmxModel {
     return res;
   }
   // 更新单据信息
-  async updateWcztmxByData(guid:string,  data: Partial<Wzcrkmx>):Promise<number> {
+  async updateWcztmxByData(guid:string,data: Partial<Wzcrkmx>):Promise<number> {
     let res = await SQLiteContext.with(WzcrkmxDao).updateWcztmxByData(guid, data)
     return res;
   }
-
+  // 更新单据信息
+  async updateWcztBySql(guid?:string, crksl?:number){
+    // const tableName = SQLiteContext.with(WzcrkmxDao).getTableName()
+    // const sql = `update ${tableName} set crksl = ${crksl} where guid = ${guid}`
+    const sql = `update TAB_BZGL_KNZY_APP_WZCRKMX set crksl = ${crksl} where guid = ${guid}`
+    Logger.info('splsplspl>>',sql)
+    return await SQLiteContext.with(WzcrkmxDao).updateWcztBySql(sql)
+  }
   // 清空表
   async clear() {
     await SQLiteContext.with(WzcrkmxDao).clearTable()

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

@@ -61,14 +61,14 @@ export struct WzInPage {
     router.pushUrl({ url: 'pages/order_detail/PzInOutDetailPage' })
   }
 
-  aboutToAppear() {
+  onPageShow() {
     this.getWzcrkList()
   }
 
   async getWzcrkList(qzh?: number, wczt?: string) {
     Logger.info('出入库传入参数>>:', JSON.stringify(this.searchData))
     this.dataSource = []
-    const res = await wzcrkModel.query({ pzlx: "14", pzh: Number(this.searchData.pzh), wczt: this.searchData.wczt, sjlx: this.currentIndex === 0 ? "导入" : "临时收物" })
+    const res = await wzcrkModel.query({ pzlx: "14", 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 => {

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

@@ -22,7 +22,7 @@ export struct WzInfo {
   private searchcontroller: SearchController = new SearchController()
   @State kfmc: string = ''
   @State sfdw: string = ''
-  @State private wzmx: WzmxClass[] = []
+  @State wzmx: WzmxClass[] = []
   @ObjectLink wzcrk: WzClass
   getDetail: (wzpm?:string) => void
 
@@ -119,7 +119,7 @@ export struct WzInfo {
             List() {
               ForEach(this.wzmx, (item) => {
                 ListItem() {
-                    WzList({ wzmx: item })
+                  WzList({ wzmx: item })
                 }
               })
             }

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

@@ -128,8 +128,7 @@ struct WzinDetail {
                           'guid': element.guid,
                           'crksl': element.crksl
                         }))
-                        let val1 = await wzcrkModel.updateWcztByData(element.guid,{crksl:element.crksl})
-                        Logger.error(this, '更新查询的入库数据>>' + JSON.stringify(val1));
+                        let val1 = await wzcrkmxModel.updateWcztmxByData(element.guid, {crksl:element.crksl})
                       } catch (e) {
                         Logger.error(this, '保存失败了>>' + JSON.stringify(e))
                       }
@@ -171,7 +170,7 @@ struct WzinDetail {
                     bottom: 300
                   })
                   setTimeout(() => {
-                    router.replaceUrl({ url: 'pages/metailmange/WzInPage/WzInPage' })
+                    router.back({ url: 'pages/metailmange/WzInPage/WzInPage' })
                   }, 300)
                 } catch (e) {
                   promptAction.showToast({