物资代码同步

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

@@ -20,7 +20,8 @@ export class BzhxDao extends BaseTable<Bzhx> {
       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'))
+      pmguid_old: cursor.getString(cursor.getColumnIndex('pmguid_old')),
+      lsm: cursor.getString(cursor.getColumnIndex('lsm'))
     }
     return info;
   }
@@ -34,7 +35,7 @@ export class BzhxDao extends BaseTable<Bzhx> {
   }
 
   getTableColumns(): string[] {
-    return ['guid', 'pmdmTen', 'pmdmSix', 'wzpm', 'hxmc', 'xh', 'pmguid', 'hxguid', 'hwzt', 'pmguid_old'];
+    return ['guid', 'pmdmTen', 'pmdmSix', 'wzpm', 'hxmc', 'xh', 'pmguid', 'hxguid', 'hwzt', 'pmguid_old', 'lsm'];
   }
 
   getCreateTableSql(): string {
@@ -48,17 +49,21 @@ export class BzhxDao extends BaseTable<Bzhx> {
 							"PMGUID" TEXT NOT NULL,
 							"HXGUID" TEXT,
 							"PMGUID_OLD" TEXT,
-							"HWZT" TEXT
+							"HWZT" TEXT,
+							"LSM" TEXT
 						  )`;
     return bzhx_sql;
   }
 
   // 获取被装号型列表
-  async getBzhxList(offset: number, pmdmsix: string): Promise<Bzhx[]> {
+  async getBzhxList(offset: number, pmdmsix: string, pmdmten?: string): Promise<Bzhx[]> {
     let wp = this.getPredicates();
     if (pmdmsix) {
       wp.equalTo('PMDMSIX', pmdmsix);
     }
+    if (pmdmten) {
+      wp.equalTo('PMDMTEN', pmdmten);
+    }
     wp.orderByAsc('GUID').offsetAs(offset).limitAs(20);
     return this.query(wp, this.getTableColumns())
   }

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

@@ -17,6 +17,10 @@ export interface Bzhx {
    */
   wzpm: string,
   /**
+   * 临时码
+   */
+  lsm:string,
+  /**
    * 无号配号品名填"无号配号"
    */
   hxmc: string,

entry/src/main/ets/model/BzhxModel.ets

@@ -10,6 +10,7 @@ class BzhxModel {
       return {
         ...v,
         pmdmSix: v.pmdmTen.slice(0,6),
+        lsm:v.pmdmSix,
         guid:uuid(),
         pmguid:"",
         hxguid:"",
@@ -21,8 +22,8 @@ class BzhxModel {
   }
 
   // 查询被装号型
-  async query(offset: number, pmdmsix? : string): Promise<Bzhx[]> {
-    let res = await SQLiteContext.with(BzhxDao).getBzhxList(offset, pmdmsix)
+  async query(offset: number, pmdmsix? : string,pmdmten? : string): Promise<Bzhx[]> {
+    let res = await SQLiteContext.with(BzhxDao).getBzhxList(offset, pmdmsix, pmdmten)
     return res;
   }
   async queryLsm(lsm?: string):Promise<Wzdm[]> {

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

@@ -34,8 +34,6 @@ class WzcrkModel {
         }
       }));
 
-
-
       await SQLiteContext.with(WzcrkDao).insert(wzcrk)
       await wzcrkmxModel.set(wzcrkmx)
     }

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

@@ -31,7 +31,6 @@ export struct PzInfo {
 
       default:
         return String(this.wzcrk[key])
-
     }
   }
 

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

@@ -87,7 +87,9 @@ export struct WzInfo {
                 .margin({ left: 10 })
                 .borderRadius(5)
               Button("查看状态").CommonButtonStyle().width("25%").margin({ left: 5, right: 5 }).onClick(() => {
-                router.pushUrl({ url: 'pages/metailmange/WzStatus' })
+                router.pushUrl({ url: 'pages/metailmange/WzStatus',params:{
+                  wzmx:this.wzmx
+                } })
               })
             }.width("100%")
           }.padding({ top: 10, bottom: 10 }).width("100%")
@@ -100,8 +102,6 @@ export struct WzInfo {
                 }
               })
             }
-
-
           }.flexGrow(1)
         }
         .padding({ bottom: 20, top: 20 })

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

@@ -15,7 +15,7 @@ export struct WzList {
 
           Row() {
             Text("货位号: ")
-            Text(this.wzmx.hwh)
+            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

@@ -7,6 +7,7 @@ import {PzInfo} from './PzInfo'
 import wzcrkmxModel from '../../../../model/WzcrkmxModel';
 import { Wzcrkmx } from '@ohos/common/src/main/ets/entity/Wzcrkmx';
 import { WzmxClass } from '../Wzin.data';
+import bzhxModel from '../../../../model/BzhxModel';
 
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
@@ -28,8 +29,8 @@ struct PzInOutDetailPage{
   @State selectedFontColor: string = '#fff'
   @State currentIndex: number = 0
   @State wzcrk: Wzcrk = null  // 物资出入库单据信息
-
   @State wzmx: WzmxClass[] = []  // 物资出入库明细
+
   private controller: TabsController = new TabsController()
 
   aboutToAppear(){
@@ -44,6 +45,9 @@ struct PzInOutDetailPage{
     const res = await wzcrkmxModel.query(this.wzcrk.guid)
     for (let index = 0; index < res.length; index++) {
       const element = res[index];
+      const res1 = bzhxModel.query(0, '', element.pmdmcode)
+
+      Logger.info('查询到对应品名代码》》',JSON.stringify(res1))
       this.wzmx.push(new WzmxClass(element))
     }
     Logger.info('接收到出入库物资明细信息>>', JSON.stringify(res))

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

 import { LeftDialog } from '../../view/LeftDialog/LeftDialog'
 import { TitleBar } from '../../view/title/TitleBar'
+import router from '@ohos.router'
+import { WzmxClass } from './WzInPage/Wzin.data'
 
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
@@ -11,7 +13,9 @@ import { TitleBar } from '../../view/title/TitleBar'
   .height(30)
   .stateEffect(true)
 }
-
+interface params {
+  wzmx: WzmxClass[]
+}
 @Entry
 @Component
 export struct WzStatus {
@@ -19,21 +23,27 @@ export struct WzStatus {
   @State private unFinishNum: number = 5
   @State private numberPercentage: string = "0/500个"
   @State show: boolean = false
-  @State private dataSource: any = [
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
-    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+  @State private dataSource: WzmxClass[] = [
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    // {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
   ]
+
+  aboutToAppear(){
+    const params = router.getParams() as params
+    this.dataSource = params.wzmx
+  }
+
   @Builder DetailBuilder() {
     Column() {
       List({ space: 2 }) {
@@ -109,12 +119,12 @@ export struct WzStatus {
 
         Row() {
           List({ space: 2 }) {
-            ForEach(this.dataSource, (item: any) => {
+            ForEach(this.dataSource, (item: WzmxClass) => {
               ListItem() {
                 Row() {
                   Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center }) {
-                    Text('名称: ' + item.mc).fontSize(14).fontColor('#3b4144')
-                    Text('代码: ' + item.dm).fontSize(14).fontColor('#3b4144')
+                    Text('名称: ' ).fontSize(14).fontColor('#3b4144')
+                    Text('代码: ').fontSize(14).fontColor('#3b4144')
                     Button('号型信息').CommonButtonStyle()
                   }
                   .width('70%')
@@ -124,8 +134,8 @@ export struct WzStatus {
 
                   Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Start }) {
                     Text('凭证数量: ' + item.pzsl).fontSize(14).fontColor('#3b4144')
-                    Text('入库数量: ' + item.rksl).fontSize(14).fontColor('#3b4144')
-                    Text(item.status).fontSize(14).fontColor( item.status == '未完成' ? 'red': 'green')
+                    Text('入库数量: ' + item.crksl).fontSize(14).fontColor('#3b4144')
+                    // Text(item.status).fontSize(14).fontColor( item.status == '未完成' ? 'red': 'green')
                   }
                   .width('40%')