提交下

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

@@ -44,8 +44,8 @@ export interface CommonHxPzMxDto {
   pmdmsix: string,
   pmdmcode: string,
   hxmc: string,
-  pzsl: string,
-  crksl: string,
+  pzsl: number,
+  crksl: number,
   hwh: string,
   mxguid: string,
   pzmxguid: string

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

@@ -361,12 +361,28 @@ export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
           items.push(this.toCommonHxPzMx(rs))
         } while (rs.goToNextRow())
       }
-      Logger.info(this, 'queryAll items=' + JSON.stringify(items))
+      Logger.info(this, 'queryAll items9999=' + JSON.stringify(items))
       return items;
     } catch (e) {
       throw new Error('[查询异常]|' + e)
     }
   }
+
+  toCommonHxPzMx(cursor: relationalStore.ResultSet): CommonHxPzMxDto {
+    let info: CommonHxPzMxDto = {
+      wzpm: cursor.getString(cursor.getColumnIndex('wzpm')),
+      pmdmsix: cursor.getString(cursor.getColumnIndex('pmdmsix')),
+      pmdmcode: cursor.getString(cursor.getColumnIndex('pmdmcode')),
+      hxmc: cursor.getString(cursor.getColumnIndex('hxmc')),
+      pzsl: cursor.getLong(cursor.getColumnIndex('pzsl')),
+      crksl: cursor.getLong(cursor.getColumnIndex('crksl')),
+      hwh: cursor.getString(cursor.getColumnIndex('hwh')),
+      mxguid: cursor.getString(cursor.getColumnIndex('mxguid')),
+      pzmxguid: cursor.getString(cursor.getColumnIndex('pzmxguid'))
+    };
+    return info;
+  }
+
   async exportPageSql(params): Promise<TestHwWzDto[]>{
     try {
       let val_sql = NativeSql.exportPageSql(params);
@@ -386,20 +402,7 @@ export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
     }
   }
 
-  toCommonHxPzMx(cursor: relationalStore.ResultSet): CommonHxPzMxDto {
-    let info: CommonHxPzMxDto = {
-      wzpm: cursor.getString(cursor.getColumnIndex('wzpm')),
-      pmdmsix: cursor.getString(cursor.getColumnIndex('pmdmsix')),
-      pmdmcode: cursor.getString(cursor.getColumnIndex('pmdmcode')),
-      hxmc: cursor.getString(cursor.getColumnIndex('hxmc')),
-      pzsl: cursor.getString(cursor.getColumnIndex('pzsl')),
-      crksl: cursor.getString(cursor.getColumnIndex('crksl')),
-      hwh: cursor.getString(cursor.getColumnIndex('hwh')),
-      mxguid: cursor.getString(cursor.getColumnIndex('mxguid')),
-      pzmxguid: cursor.getString(cursor.getColumnIndex('pzmxguid'))
-    };
-    return info;
-  }
+
 
   async insertWz(params) {
     try {

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

@@ -83,18 +83,18 @@ WHERE
   }
 
   // 查询物资明细是否含有对应物资数据
-  static getPzMxItemSql(params, isPmSix): string {
+  static getPzMxItemSql(params, isPmSix):string {
     if (isPmSix) {
-      return `select * from TAB_BZGL_KNZY_APP_WZCRKMX where wzcrkguid='${params.wzcrkguid}' and substr(PMDMCODE,1,6)='${params.pmdmcode}'`
+      return `select * from TAB_BZGL_KNZY_APP_WZCRKMX where wzcrkguid=${isEmpty(params.wzcrkguid)} and substr(PMDMCODE,1,6)=${isEmpty(params.pmdmcode)}`
     } else {
-      return `select * from TAB_BZGL_KNZY_APP_WZCRKMX where wzcrkguid='${params.wzcrkguid}' and PMDMCODE='${params.pmdmcode}'`
+      return `select * from TAB_BZGL_KNZY_APP_WZCRKMX where wzcrkguid=${isEmpty(params.wzcrkguid)} and PMDMCODE=${isEmpty(params.pmdmcode)}`
     }
   }
 
   // 查询同号型
-  static getCommonHxPzMxSql(params): string {
+  static getCommonHxPzMxSql(params):string {
     // pmdm前6位
-    return `select hx.wzpm wzpm, hx.pmdmsix pmdmsix,hx.pmdmten pmdmcode, hx.hxmc hxmc, mx.pzsl pzsl, mx.crksl crksl, mx.hwh hwh, mx.guid mxguid,mx.pzmxguid pzmxguid 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_bzhx hx on mx.pmdmcode = hx.pmdmten where crk.guid = '${(params.guid)}' and hx.PMDMSIX= '${(params.pmdm)}' order by hx.PMDMSIX, hx.XH`
+    return `select hx.wzpm wzpm, hx.pmdmsix pmdmsix,hx.pmdmten pmdmcode, hx.hxmc hxmc, mx.pzsl pzsl, mx.crksl crksl, mx.hwh hwh, mx.guid mxguid,mx.pzmxguid pzmxguid 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_bzhx hx on mx.pmdmcode = hx.pmdmten where crk.guid = ${isEmpty(params.guid)} and hx.PMDMSIX= ${isEmpty(params.pmdm)} order by hx.PMDMSIX, hx.XH`
   }
 
   // 出入盘库
@@ -111,7 +111,7 @@ WHERE
   }
   // -- -- - 物资列表详情
   static getPzMxSql(params): string {
-    const sql = `select * from (select hx.wzpm wzpm, hx.pmdmsix pmdmsix,hx.pmdmten pmdmcode, hx.hxmc hxmc, mx.pzsl pzsl, mx.crksl crksl, mx.hwh hwh, mx.guid mxguid ,mx.pzmxguid 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_bzhx hx on mx.pmdmcode = hx.pmdmten where crk.guid = '${params.guid}' order by hx.PMDMSIX, hx.XH)`
+    const sql = `select * from (select hx.wzpm wzpm, hx.pmdmsix pmdmsix,hx.pmdmten pmdmcode, hx.hxmc hxmc, mx.pzsl pzsl, mx.crksl crksl, mx.hwh hwh, mx.guid mxguid ,mx.pzmxguid 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_bzhx hx on mx.pmdmcode = hx.pmdmten where crk.guid = ${isEmpty(params.guid)} order by hx.PMDMSIX, hx.XH)`
     return sql
   }
 

entry/src/main/ets/pages/metailmange/Common/WzDetail.ets

@@ -5,7 +5,7 @@ import { Wzcrk } from '@ohos/common/src/main/ets/entity/Wzcrk';
 import { WzInfo } from './WzInfo'
 import { PzInfo } from '../WzInPage/WzinDetail/PzInfo'
 import wzcrkmxModel from '../../../model/WzcrkmxModel';
-import { historicalInformationClass, PzFormClass, WzClass, WzmxClass } from './Wzcrk.data';
+import { PzFormClass, WzClass, WzmxClass } from './Wzcrk.data';
 import promptAction from '@ohos.promptAction';
 import wzcrkModel from '../../../model/WzcrkModel';
 import { AddWzin } from '../WzInPage/WzinDetail/AddWzin'
@@ -41,7 +41,6 @@ struct WzinDetail {
   @State pageType: string = '入库'
   @State pzxqGuild: string = ''
   @State wzcrk: WzClass = null // 物资出入库单据信息
-  @State historicalInformation: historicalInformationClass[] = [] // 物资出入库明细
   @State pzForm: PzFormClass = null // 物资出入库表单详情
   @State flag: boolean = true
   private controller: TabsController = new TabsController()
@@ -92,7 +91,7 @@ struct WzinDetail {
     }
 
     this.getWzFormDetail()
-    this.getWzmxList()
+    // this.getWzmxList()
     this.scanCodeListen()
     IdentifyService.openScanPort()
   }
@@ -104,14 +103,6 @@ struct WzinDetail {
     this.pzForm = new PzFormClass(res[0])
   }
 
-  // 获取物资列表详情信息
-  async getWzmxList(wzpm?) {
-    const pzmxRes = await wzcrkModel.getPzMx({ guid: this.wzcrk.guid })
-    pzmxRes.forEach((element) => {
-      this.historicalInformation.push(new historicalInformationClass(element))
-    })
-    Logger.info('接收到出入库物资明细信息>>', JSON.stringify(pzmxRes))
-  }
 
   /***
    * @description: 保存
@@ -227,8 +218,6 @@ struct WzinDetail {
               WzInfo({
                 wzcrk: this.wzcrk,
                 pzForm: this.pzForm,
-                getDetail: this.getWzmxList,
-                historicalInformation: this.historicalInformation,
                 pageType: this.pageType,
                 dataType: this.dataType,
                 isHaveButton: this.isHaveButton
@@ -254,7 +243,6 @@ struct WzinDetail {
             Button("保存").CommonButtonStyle().width(['入库', '出库'].includes(this.pageType) ? '50%' : '90%')
               .onClick(async () => {
                 try {
-                  Logger.info('保存的入库明细数据>>', JSON.stringify(this.historicalInformation))
                   this.submit()
 
                 } catch (e) {

entry/src/main/ets/pages/metailmange/Common/WzInfo.ets

@@ -11,6 +11,9 @@ import emitter from '@ohos.events.emitter';
 import Prompt from '@system.prompt';
 import wzcrkmxModel from '../../../model/WzcrkmxModel';
 import { dateUtils, uuid } from '@ohos/common/src/main/ets/utils/util';
+import promptAction from '@ohos.promptAction';
+import wzcrkModel from '../../../model/WzcrkModel';
+import xtpzInfoModel from '../../../model/XtpzInfoModel';
 
 
 @Extend(Button) function CommonButtonStyle() {
@@ -44,7 +47,6 @@ export struct WzInfo {
   @State kfmc: string = ''
   @State rkkfmc: string = ''
   @ObjectLink wzcrk: WzClass
-  getDetail: (wzpm?: string) => void
   scanInfoDialog: CustomDialogController = new CustomDialogController({
     builder: WzScanInfoDialog({
       container: this.container,
@@ -136,6 +138,8 @@ export struct WzInfo {
   // 页面初始化
   aboutToAppear() {
     this.pzxqGuild = this.wzcrk.guid
+    // 获取物资明细信息
+    this.getMxDetailsData()
     this.getData()
     this.scanCodeListen();
   }
@@ -143,7 +147,6 @@ export struct WzInfo {
   // 在自定义组件即将析构销毁时将dialogController置空
   aboutToDisappear() {
     this.scanInfoDialog = undefined // 将dialogController置空
-    Logger.info('Aaaaa>>', JSON.stringify(this.historicalInformation))
   }
 
   scanCodeListen() {
@@ -169,6 +172,30 @@ export struct WzInfo {
     }
   }
 
+  async getMxDetailsData() {
+    try {
+      const params = {
+        guid: this.pzxqGuild
+      }
+      const res = await wzcrkModel.getPzMx(params)
+      // 3.设置物资数据状态
+      if (res && res.length > 0) {
+        this.isAutomation = false
+        res.forEach(element => {
+          this.historicalInformation.push(new historicalInformationClass(element))
+        })
+        this.setDefaultActive()
+      } else {
+        this.isAutomation = true
+        this.historicalInformation = []
+      }
+    } catch (e) {
+      promptAction.showToast({
+        message: '获取明细信息失败'
+      })
+    }
+  }
+
   /***
    * @description: 扫码解析
    */
@@ -438,8 +465,13 @@ export struct WzInfo {
         })
       }
       this.currentPmdmcode = ITEM.pmdmcode
-      // @ts-ignore
-      this.historicalInformation = res
+      this.historicalInformation = []
+      res.forEach(element => {
+        this.historicalInformation.push(new historicalInformationClass(element))
+      })
+      res.forEach(i => {
+        Logger.info(this, '赋值成为了什么', JSON.stringify(i))
+      })
       this.setDefaultActive()
       callback && callback()
     } catch (e) {
@@ -506,7 +538,7 @@ export struct WzInfo {
       }
       console.log("updateParams", JSON.stringify(updateParams))
       let s = await wzcrkmxModel.updateWzmx(updateParams)
-      console.log("updateParams执行成功或者失败:" + JSON.stringify(this.historicalInformation))
+      console.log("updateParams执行成功或者失败:" + s)
     } else {
       var insert_crksl = 0
       if (this.pageType == '倒库' || this.pageType == '调号' || this.pageType == '换位') {
@@ -1146,36 +1178,35 @@ export struct WzInfo {
           .width("100%")
 
           Row() {
-            if (this.isAutomation) {
-              Column() {
-                Text("请扫描货位码").fontColor("#36a3c0").fontSize(24)
-              }.width("100%").height(480)
-            } else {
+
               Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
-                Search({ placeholder: '请输入品名名称', controller: this.searchcontroller })
-                  .height(40)
-                  .backgroundColor('#F5F5F5')
-                  .placeholderColor(Color.Grey)
-                  .textAlign(TextAlign.Center)
-                  .placeholderFont({ size: 14, weight: 400 })
-                  .textFont({ size: 14, weight: 400 })
-                  .width('75%')
-                  .onSubmit((value: string) => {
-                    this.getDetail(value)
-                  })
-                  .onChange((value: string) => {
+                if (this.isAutomation) {
+                  Column() {
+                    Text("请扫描货位码").fontColor("#36a3c0").fontSize(24)
+                  }.width("100%").height(30)
+                } else {
+                  Search({ placeholder: '请输入品名名称', controller: this.searchcontroller })
+                    .height(40)
+                    .backgroundColor('#F5F5F5')
+                    .placeholderColor(Color.Grey)
+                    .textAlign(TextAlign.Center)
+                    .placeholderFont({ size: 14, weight: 400 })
+                    .textFont({ size: 14, weight: 400 })
+                    .width('75%')
+                    .onSubmit((value: string) => {
+                    })
+                    .onChange((value: string) => {
+                    })
+                    .margin({ left: 10 })
+                    .borderRadius(5)
+                  Button("查看状态").CommonButtonStyle().width("25%").margin({ left: 5, right: 5 }).onClick(() => {
+                    router.pushUrl({ url: 'pages/metailmange/WzStatus', params: {
+                      wzcrkguid: this.pzxqGuild,
+                      pageType: this.pageType
+                    }})
                   })
-                  .margin({ left: 10 })
-                  .borderRadius(5)
-                Button("查看状态").CommonButtonStyle().width("25%").margin({ left: 5, right: 5 }).onClick(() => {
-                  router.pushUrl({ url: 'pages/metailmange/WzInPage/WzinDetail/WzStatus', params: {
-                    // wzmx: this.historicalInformation
-                    pageType: this.pageType,
-                    wzcrkguid: this.pzxqGuild
-                  } })
-                })
+                }
               }.width("100%")
-            }
           }.padding({ top: 10, bottom: 10 }).width("100%")
 
           Column() {

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

@@ -188,7 +188,6 @@ export struct WzStatus {
   existApp() {
     console.info('Click the callback in the blank area')
   }
-
   build() {
     Column() {
       TitleBar({ title: "物资状态" })

entry/src/main/ets/pages/metailmange/WzInvPage/WzInvDetail/WzInvDetail.ets

@@ -85,7 +85,7 @@ struct WzInvDetail{
 
           TabContent() {
             Column() {
-              WzInfo({ wzcrk: this.wzcrk, getDetail: this.getDetail })
+              WzInfo({ wzcrk: this.wzcrk })
             }.width("100%")
           }.tabBar(this.TabBuilder(1, '物资信息'))
         }

entry/src/main/ets/pages/metailmange/WzOutPage/WzOutDetail/WzOutDetail.ets

@@ -92,7 +92,7 @@ struct WzOutDetail {
 
           TabContent() {
             Column() {
-              WzInfo({ wzcrk: this.wzcrk, getDetail: this.getDetail, pageType: "出库" })
+              WzInfo({ wzcrk: this.wzcrk, pageType: "出库" })
             }.width("100%")
           }.tabBar(this.TabBuilder(1, '物资信息'))
         }

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

@@ -19,7 +19,7 @@ struct WzReversePage{
   @State selectedFontColor: string = '#fff'
   @State currentIndex: number = 0
   private controller: TabsController = new TabsController()
-  private  searchcontroller: SearchController = new SearchController()
+  private searchcontroller: SearchController = new SearchController()
   itemClick() {
     router.pushUrl({url:'pages/order_detail/PzPourStoragePage'})
   }