Merge remote-tracking branch 'origin/master'

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

@@ -43,11 +43,11 @@ export class KfInfoDao extends BaseTable<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)
+      if(value) {
+        wp.equalTo(key, value)
+      }
     }
     wp.orderByAsc("KFDM");
     return this.query(wp, this.getTableColumns());

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

@@ -121,6 +121,11 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
     return this.updateData(valueBucket, wp)
   }
 
+  async updateWcztBySql(sql) {
+    Logger.info("执行的sql>>" ,sql)
+    let db = await this.futureDb;
+    return await db.executeSql(sql);
+}
 
   async getWzcrk(data: Partial<Wzcrk>): Promise<Wzcrk[]> {
     let wp = this.getPredicates();

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

@@ -164,16 +164,17 @@ export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
     //return db.update(valueBucket,wp);
     // return this.update(data as Wzcrkmx)
     const valueBucket = {
+      CRKSL: 20
     };
 
-    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)
+    wp.equalTo('GUID', guid)
     return this.updateData(valueBucket, wp)
   }
 

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

@@ -77,6 +77,13 @@ 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() {
     await SQLiteContext.with(WzcrkDao).clearTable()

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

@@ -53,7 +53,7 @@ export struct WzInPage {
     pzh: this.pzh,
     page: this.page,
     rows: this.rows,
-    sjlx: this.currentIndex === 0 ? "导入" : "临时收物",
+    sjlx: this.currentIndex === 0 ? "导入" : "新建",
     wczt: "未完成"
   }
 
@@ -399,7 +399,7 @@ export struct WzInPage {
                   WzList({ item, checkedList: $checkedList }).width('100%').backgroundColor('#fff')
                 }.onClick(() => {
                   router.pushUrl({ url: 'pages/metailmange/WzInPage/WzinDetail/WzinDetail', params: {
-                    wzcrk: item
+                    wzcrk: item,isUpdate:true
                   } },)
                 })
               })

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

@@ -66,7 +66,6 @@ export struct AddWzin {
       options: [],
       required: true
     },
-    { title: "运单号", key: 'ydh', enabled: true, type: 'input' },
     {
       title: "发物管理单位",
       key: 'fwgldwdm',
@@ -91,6 +90,7 @@ export struct AddWzin {
       options: [],
       required: true
     },
+    { title: "运单号", key: 'ydh', enabled: true, type: 'input' },
     { title: "备注", key: 'dec', enabled: true, type: 'input' }
   ]
 
@@ -191,20 +191,24 @@ export struct AddWzin {
           ListItem() {
             Column() {
               Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center }) {
-                if (item.required) {
-                  Text('*').fontColor('red').margin({ right: 5 })
-                }
-                Text(item.title)
-                  .fontSize(14)
-                  .width("30%")
-                  .height(40)
-                  .fontColor($r("app.color.item_color_black"))
+
+                Row(){
+                  if (item.required) {
+                    Text('*').fontColor('red').margin({ right: 5 })
+                  }
+                  Text(item.title)
+                    .fontSize(14)
+                    .height(40)
+                    .fontColor($r("app.color.item_color_black"))
+                }.width("35%")
+
                 if (item.type == 'select') {
                   Select(item.options)
                     .value(`请选择${item.title}`)
                     .width(230)
                     .borderWidth(1)
                     .borderRadius(5)
+                    .flexGrow(1)
                     .borderColor($r("app.color.rank_secondary_border"))
                     .onSelect((index: number, value?: string) => {
                       this.wzcrk[item.key] = item.options[index].id
@@ -216,9 +220,9 @@ export struct AddWzin {
                     .enterKeyType(EnterKeyType.Search)
                     .borderColor("#454545")
                     .borderRadius(5)
-                    .width("70%")
                     .height(40)
                     .padding(10)
+                    .flexGrow(1)
                     .borderColor('#bcc5d7')
                     .borderWidth(1)
                     .backgroundColor(item.enabled ? '#fff' : "app.color.disabledColor")

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

@@ -84,7 +84,7 @@ export struct PzInfo {
                   .width("30%")
                   .height(40)
                   .fontColor($r("app.color.item_color_black"))
-                TextInput({ text: this.handleText(item.key) })
+                TextInput({ text: this.handleText(item.key),placeholder: `请输入${item.title}` })
                   .enterKeyType(EnterKeyType.Search)
                   .borderColor("#454545")
                   .borderRadius(5)

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

@@ -9,13 +9,14 @@ export struct WzList {
     Column() {
       Flex({ justifyContent: FlexAlign.SpaceBetween }) {
         Column() {
-          Text(this.wzmx.wzpm).padding({ top: 5, bottom: 5 })
+          Text(this.wzmx.wzpm).padding({ top: 5, bottom: 5 }).alignSelf(ItemAlign.Start)
           Row() {
             Text("号型: " + this.wzmx.hxmc)
           }.alignSelf(ItemAlign.Start).padding({ top: 5, bottom: 5 })
 
           Row() {
-            Text("货位号: " + this.wzmx.hwh == '' ? '暂无货位号': this.wzmx.hwh)
+             Text('货位号')
+            Text( this.wzmx.hwh == '' ? '暂无货位号': this.wzmx.hwh)
           }.alignSelf(ItemAlign.Start).padding({ top: 5, bottom: 5 })
         }.margin({ left: 15 })
 

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

@@ -6,7 +6,6 @@ import { WzInfo } from './WzInfo'
 import { PzInfo } from './PzInfo'
 import wzcrkmxModel from '../../../../model/WzcrkmxModel';
 import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
-import bzhxModel from '../../../../model/BzhxModel';
 import promptAction from '@ohos.promptAction';
 import wzcrkModel from '../../../../model/WzcrkModel';
 import { SQLiteContext, Wzcrkmx, WzcrkmxDao } from '@ohos/common';
@@ -115,10 +114,26 @@ struct WzinDetail {
                   Logger.info('保存的入库明细数据>>', JSON.stringify(this.wzmx))
 
                   if(this.isUpdate) {
+                    const crksl = this.wzmx.map(v => Number(v.crksl)).reduce((a, b) => a + b, 0)
                     await wzcrkModel.updateWcztByData(this.wzcrk.guid, {
                       dec: this.wzcrk.dec,
                       ydh: this.wzcrk.ydh,
+                      crksl
                     })
+
+                    for (let index = 0; index < this.wzmx.length; index++) {
+                      const element = this.wzmx[index];
+                      try {
+                        Logger.error(this, '更新数据参数' + JSON.stringify({
+                          'guid': element.guid,
+                          'crksl': element.crksl
+                        }))
+                        let val1 = await wzcrkModel.updateWcztByData(element.guid,{crksl:element.crksl})
+                        Logger.error(this, '更新查询的入库数据>>' + JSON.stringify(val1));
+                      } catch (e) {
+                        Logger.error(this, '保存失败了>>' + JSON.stringify(e))
+                      }
+                    }
                   }
 
                   else {

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

 import { SQLiteContext, Logger, WzcrkmxDao, Wzcrkmx } from '@ohos/common'
+import wzcrkModel from '../../model/WzcrkModel'
+import wzcrkmxModel from '../../model/WzcrkmxModel'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
 import { TitleBar } from '../../view/title/TitleBar'
 
@@ -45,27 +47,17 @@ export struct Pick {
         Row() {
           Flex({ justifyContent: FlexAlign.SpaceAround }) {
             Button("打印面单").CommonButtonStyle().onClick(async () => {
-              let val = await this.wzcrkmxDao.batchInsert([{
-                guid: '123',
-                gznd: '2023',
-                pmdmcode: '10001',
-                pzsl: 100,
-                crksl: 0,
-                wzcrkguid: '1000',
-                hwh: '1-1-1-2',
-                pzmxguid: '1000'
-              }, {
-                guid: '124',
-                gznd: '2023',
-                pmdmcode: '10001',
-                pzsl: 880,
-                crksl: 0,
-                wzcrkguid: '1000',
-                hwh: '1-1-2-2',
-                pzmxguid: '1000'
-              }]);
-              Logger.info(this, '输出数据:' + val);
-            })
+
+           const res = await wzcrkModel.query({})
+           const res1 = await wzcrkmxModel.query(res[0].guid)
+           Logger.info(this, '输出更新数据>>:' + JSON.stringify(res1));
+
+                await wzcrkmxModel.updateWcztmxByData(res1[0].guid, {crksl: 20})
+
+              const res2 = await wzcrkmxModel.query(res[0].guid)
+              Logger.info(this, '输出更新数据111>>:' + JSON.stringify(res2));
+          })
+
             Button("扫码取件").CommonButtonStyle().onClick(async () => {
               let val = await this.wzcrkmxDao.update({ guid: '124', crksl: 888 } as Wzcrkmx);
               Logger.info(this, '输出更新数据:' + val);
@@ -74,7 +66,6 @@ export struct Pick {
               let val = await this.wzcrkmxDao.queryAll();
               Logger.info(this, '输出查询数据:' + JSON.stringify(val));
             })
-          }
         }.height(80).backgroundColor('#97c6a6')
       }
     }.linearGradient({
@@ -83,4 +74,4 @@ export struct Pick {
       colors: [[0x36a3c0, 0.0], [0x97c6a6, 1.0], [0xc7d799, 2.0]]
     })
   }
-}
\ No newline at end of file
+}}
\ No newline at end of file