提交代码

common/src/main/ets/db/BaseTable.ets

@@ -84,6 +84,22 @@ export default abstract class BaseTable<T> implements ITable {
   }
 
   /**
+   * 清空表
+   */
+  async clearTableBySql(sql): Promise<void> {
+    let db = await this.futureDb;
+    try {
+      // db.beginTransaction();
+      await db.executeSql(sql);
+      Logger.info('clearTableBySql>>', sql)
+      // db.commit();
+    } catch (e) {
+      Logger.error(this, "清空表失败：", e, sql);
+      db.rollBack();
+    }
+  }
+
+  /**
    * 插入数据
    * @param item 插入对象
    */

entry/src/main/ets/model/DrModel.ets

-import { DrInfo, SQLiteContext, DrInfoDao } from '@ohos/common'
-import { uuid, dateUtils } from '@ohos/common/src/main/ets/utils/util'
+import { DrInfo, DrInfoDao, Logger, SQLiteContext } from '@ohos/common'
+import { dateUtils, uuid } from '@ohos/common/src/main/ets/utils/util'
 
 // 导入
 class DrModel {
@@ -13,6 +13,7 @@ class DrModel {
       size: 0,
       time: dateUtils.formatDateTime(new Date(), 'all')
     }
+    Logger.info('添加导入>>', JSON.stringify(obj))
     await SQLiteContext.with(DrInfoDao).insert(obj)
   }
 

entry/src/main/ets/pages/metailmange/Common/Dialog/LeftDialog.ets

+import { PmActive } from '@ohos/common/src/main/ets/bean/dto/BzhxDto'
+import { Logger } from '@ohos/common/src/main/ets/utils/Logger'
+import bzhxModel from '../../../../model/BzhxModel'
+
+@Extend(Text) function activeColor() {
+  .fontColor('#4fd055')
+  .fontSize(20)
+}
+
+@CustomDialog
+@Component
+export struct LeftDialog {
+  controller: CustomDialogController
+  cancel: () => void
+  confirm: () => void
+  @State datasourcepm: PmActive[] = []
+  pageType: string = ''
+  wzcrkguid: string = ''
+  @State wcsl: number = 0
+  @State wwcsl: number = 0
+  @State pzslhj: number = 0
+  @State crkhj: number = 0
+  @State pmwcsl: number = 0
+  @State pmwwcsl: number = 0
+  @State pmpzslhj: number = 0
+  @State pmcrkhj: number = 0
+  current: PmActive
+
+  aboutToAppear() {
+    Logger.info('this.current>>', JSON.stringify(this.current))
+    this.handleviewpm(this.current)
+  }
+
+  async handleviewpm(row) {
+    this.datasourcepm = [];
+    const params = {
+      wzcrkguid: this.wzcrkguid,
+      pmdmcode: row.pmdm,
+    };
+    // const res = await selectInformationType(
+    //   "GY_M_PMV3",
+    //   getPmhxDetailActive(params, this.pageType)
+    // );
+    const res = await bzhxModel.getPmhxDetailActive(params, this.pageType) as PmActive[]
+    console.log("查询sql", JSON.stringify(res));
+    this.datasourcepm = res;
+    const wcData = res.filter((item) => item.wczt == "");
+    console.log("wcDatawcData", wcData);
+    this.pmwcsl = wcData.length;
+    const wwcData = res.filter((item) => item.wczt == "未完成");
+    this.pmwwcsl = wwcData.length;
+    const pzslList = res.map((item) => item.pzsl);
+    const crkslList = res.map((item) => item.crksl);
+    var pzslHj = 0;
+    var crkslHj = 0;
+    if (pzslList && pzslList.length > 0) {
+      pzslHj = pzslList.reduce(function (prev, cur, index, array) {
+        return Number(prev) + Number(cur);
+      });
+    } else {
+      pzslHj = 0;
+    }
+    if (crkslList && crkslList.length > 0) {
+      crkslHj = crkslList.reduce(function (prev, cur, index, array) {
+        return Number(prev) + Number(cur);
+      });
+    } else {
+      crkslHj = 0;
+    }
+    // return pzslHj + '/' + crkslHj
+    this.pmpzslhj = pzslHj;
+    this.pmcrkhj = crkslHj;
+    // this.dialogController.open()
+  }
+
+  convertionCrkName() {
+    // return this.pageType+'数量'
+    switch (this.pageType) {
+      case "入库":
+        return "入库数量";
+      case "出库":
+        return "出库数量";
+      case "盘库":
+        return "盘库数量";
+      case "调号":
+        return "实调数量";
+      case "倒库":
+        return "实倒数量";
+      case "换位":
+        return "换入数量";
+      default:
+        return "出入库数量";
+    }
+  }
+
+  convertionPzslName() {
+    switch (this.pageType) {
+      case "入库":
+        return "凭证数量";
+      case "出库":
+        return "凭证数量";
+      case "盘库":
+        return "入库数量";
+      case "调号":
+        return "应调数量";
+      case "倒库":
+        return "应倒数量";
+      case "换位":
+        return "换出数量";
+      default:
+        return "凭证数量";
+    }
+  }
+
+  build() {
+    Column() {
+      Column() {
+        Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+          Text('品名:').activeColor()
+          Text(this.current.wzpm).activeColor()
+        }.padding({ top: 5, bottom: 5 })
+
+        Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+          Text('数量:').activeColor()
+          Text(this.pmcrkhj + '/' + this.pmpzslhj + '个').activeColor()
+        }.padding({ top: 5, bottom: 5 })
+
+        Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+          Text('未完成/完成:').activeColor()
+          Text(this.pmwcsl + '/' + this.pmwcsl + '个').activeColor()
+        }.padding({ top: 5, bottom: 5 })
+      }.margin({ top: 25, left: 10 })
+
+      List({ space: 2 }) {
+
+        ForEach(this.datasourcepm, (item: PmActive) => {
+          ListItem() {
+            Row() {
+              Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center }) {
+                Text('号型:' + item.hxmc).fontSize(14).fontColor('#3b4144')
+                Text(this.convertionPzslName() + item.pzsl).fontSize(14).fontColor('#3b4144').margin({ top: 14 })
+              }
+              .width('70%')
+
+              Blank()
+                .layoutWeight(1)
+              Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Start }) {
+                if (item.wczt == '未完成') {
+                  Text('未完成').fontSize(14)
+                } else {
+                  Text('完成').fontSize(14)
+                }
+                Text(this.convertionCrkName() + item.crksl).fontSize(14).fontColor('#3b4144').margin({ top: 14 })
+              }
+              .width('40%')
+            }
+            .width('100%')
+            .justifyContent(FlexAlign.SpaceBetween)
+            .padding({ left: 12, right: 18 })
+          }.height(90)
+        })
+
+      }
+    }.width('100%')
+    .width('60%')
+    .height('100%')
+    .backgroundColor('#fff')
+  }
+}
\ No newline at end of file

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

-// import { LeftDialog } from './LeftDialog'
 import { TitleBar } from '../../../view/title/TitleBar'
 import router from '@ohos.router'
 import { WzmxClass } from './Wzcrk.data'
 import { dateUtils } from '@ohos/common'
 import bzhxModel from '../../../model/BzhxModel'
 import { PmActive } from '@ohos/common/src/main/ets/bean/dto/BzhxDto'
+import { LeftDialog } from './Dialog/LeftDialog'
 
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
@@ -35,17 +35,20 @@ export struct WzStatus {
   @State pmwwcsl: number = 0
   @State pmpzslhj: number = 0
   @State pmcrkhj: number = 0
+  @State current: PmActive = null
+  dialogController: CustomDialogController = new CustomDialogController({
+    builder: LeftDialog({
+      cancel: this.onCancel,
+      confirm: this.onSubmit,
+      current: this.current,
+      pageType: this.pageType,
+      wzcrkguid: this.wzcrkguid
+    }),
+    alignment: DialogAlignment.CenterEnd,
+    customStyle: true,
+  })
   @State private dataSource: PmActive[] = []
   @State private datasourcepm: PmActive[] = []
-  // dialogController: CustomDialogController = new CustomDialogController({
-  //   builder: LeftDialog({
-  //     cancel: this.onCancel,
-  //     confirm: this.onSubmit,
-  //     datasourcepm: this.datasourcepm
-  //   }),
-  //   alignment: DialogAlignment.CenterEnd,
-  //   customStyle: true,
-  // })
 
   aboutToAppear() {
     const params = router.getParams() as params
@@ -136,7 +139,7 @@ export struct WzStatus {
 
   async handleviewpm(row) {
     this.datasourcepm = [];
-    // this.current = row;
+    this.current = row;
     const params = {
       wzcrkguid: this.wzcrkguid,
       pmdmcode: row.pmdm,
@@ -174,7 +177,7 @@ export struct WzStatus {
     // return pzslHj + '/' + crkslHj
     this.pmpzslhj = pzslHj;
     this.pmcrkhj = crkslHj;
-    // this.dialogController.open()
+    this.dialogController.open()
   }
 
   onCancel() {
@@ -188,6 +191,7 @@ export struct WzStatus {
   existApp() {
     console.info('Click the callback in the blank area')
   }
+
   build() {
     Column() {
       TitleBar({ title: "物资状态" })
@@ -247,7 +251,8 @@ export struct WzStatus {
               }
               .height(90)
               .onClick(() => {
-                this.handleviewpm(item)
+                this.current = item
+                this.dialogController.open()
               })
             })
           }

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

-// import { PmActive } from '@ohos/common/src/main/ets/bean/dto/BzhxDto'
-// import { WzmxClass } from '../../Common/Wzcrk.data'
-// @CustomDialog
-// @Component
-// export struct LeftDialog {
-//   controller: CustomDialogController
-//   cancel: () => void
-//   confirm: () => void
-//   datasourcepm: PmActive[]
-//
-//   build() {
-//     Column() {
-//       List({ space: 2 }) {
-//         ListItem() {
-//           Row() {
-//             Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center }) {
-//               Text('号型:' + this.item.xh).fontSize(12).fontColor('#3b4144')
-//               Text('凭证数量:' + this.item.pzsl).fontSize(12).fontColor('#3b4144').margin({ top: 30 })
-//             }
-//             .width('70%')
-//             Blank()
-//               .layoutWeight(1)
-//             Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Start }) {
-//               if(this.item.wczt == '未完成' && this.item.crksl < this.item.pzsl) {
-//                 Text('未完成').fontSize(14).fontColor('red')
-//               } else {
-//                 Text('完成').fontSize(14).fontColor( 'green')
-//               }
-//               Text('入库数量: ' + this.item.crksl).fontSize(12).fontColor('#3b4144').margin({ top: 30 })
-//             }
-//             .width('40%')
-//           }
-//           .width('100%')
-//           .justifyContent(FlexAlign.SpaceBetween)
-//           .padding({ left: 12, right: 18 })
-//         }.height(90)
-//       }.margin({ top: 100 })
-//     }.width('100%')
-//     .width('60%')
-//     .height('100%')
-//     .backgroundColor('#fff')
-//   }
-// }
\ No newline at end of file

entry/src/main/ets/pages/sub_systemMaintenance/DataSynchronism/ListDialog.ets

@@ -12,6 +12,9 @@ import hwModel from '../../../model/HwModel'
 import hjModel from '../../../model/HjModel'
 import gldwModel from '../../../model/GldwModel'
 import drModel from '../../../model/DrModel'
+import { deleteSql } from '../../../sql'
+import { SQLiteContext } from '@ohos/common/src/main/ets/db/SQLiteContext'
+import { BgglDao } from '@ohos/common/src/main/ets/db/dao/BgglDao'
 
 @CustomDialog
 @Component
@@ -37,94 +40,54 @@ export struct ListDialog {
     console.log("onCancel")
   }
 
-  async onSubmit(content: string) {
-
+  async onSubmit(content) {
+    var newData = deleteSql.delete_jc_sql_list;
+    var clearText = "清除基础数据";
     switch (content) {
-
       case '是否确定清除基础数据':
-        try {
-          await qyModel.clear();
-          await kfModel.clear();
-          await hwModel.clear();
-          await hjModel.clear();
-          await gldwModel.clear();
-          await bzhxModel.clear()
-          await drModel.set('清除基础数据')
-          await this.getDrData()
-          promptAction.showToast({
-            message: '清除基础数据成功'
-          })
-        } catch (e) {
-          promptAction.showToast({
-            message: '清除基础数据失败'
-          })
-        }
+        newData = deleteSql.delete_jc_sql_list;
+        clearText = "清除基础数据";
         break;
-
       case '是否确认清除单据数据':
-        try {
-          await wzcrkModel.clear()
-          await wzcrkmxModel.clear()
-          await drModel.set('清除单据数据')
-          // await  this.getDrData()
-          promptAction.showToast({
-            message: '清除单据数据成功'
-          })
-        } catch (e) {
-          promptAction.showToast({
-            message: '清除单据数据失败'
-          })
-        }
+        newData = deleteSql.delete_dj_sql_list;
+        clearText = "清除单据数据";
         break;
-
       case '是否确认清除包裹数据':
-        try {
-          await bgglModel.clear()
-          await drModel.set('清除包裹数据')
-          await  this.getDrData()
-          promptAction.showToast({
-            message: '清除包裹数据成功'
-          })
-        } catch (e) {
-          promptAction.showToast({
-            message: '清除包裹数据失败'
-          })
-        }
+        newData = deleteSql.delete_bg_sql_list;
+        clearText = "清除包裹数据";
         break;
-
       case '是否确认清除品名及号型数据':
-        try {
-          await  bzhxModel.clear()
-          await drModel.set('清除品名及号型')
-          await  this.getDrData()
-          promptAction.showToast({
-            message: '清除品名及号型数据成功'
-          })
-        } catch (e) {
-          promptAction.showToast({
-            message: '清除品名及号型数据失败'
-          })
-        }
+        newData = deleteSql.delete_pmhx_sql_list;
+        clearText = "清除品名号型数据";
         break;
-
       case '是否确认清除导入导出数据':
-        try {
-          await  drModel.clear()
-          await drModel.set('清除导入导出数据')
-          await  this.getDrData()
-          promptAction.showToast({
-            message: '清除导入导出数据成功'
-          })
-        } catch (e) {
-          promptAction.showToast({
-            message: '清除导入导出数据失败'
-          })
-        }
+        newData = deleteSql.delete_port_sql_list;
+        clearText = "清除导入导出数据";
+        break;
+      case '是否确认清除全部数据':
+        newData = deleteSql.delete_all_sql_list;
+        clearText = "清除全部数据";
         break;
-
       default:
+        newData = deleteSql.delete_jc_sql_list;
+        clearText = "清除基础数据";
         break;
     }
+    newData.forEach(async (item, index) => {
+
+
+      await SQLiteContext.with(BgglDao).clearTableBySql(item)
+      const last = newData.length - 1;
+      if (last == index) {
+        setTimeout(async () => {
+          await drModel.set(clearText || "清除数据")
+          promptAction.showToast({
+            message: `${clearText}成功`
+          })
+          // this.init();
+        }, 800);
+      }
+    });
   }
 
   handleClick(item) {

entry/src/main/ets/pages/sub_systemMaintenance/DataSynchronism/modal/BasicInfoModal.ets

@@ -42,11 +42,7 @@ export struct BasicInfoModal {
     try {
       this.controller.close()
       this.showProgress = true
-      await qyModel.clear();
-      await kfModel.clear();
-      await hwModel.clear();
-      await hjModel.clear();
-      await gldwModel.clear();
+
       const res = await getPmList({ rows: 5000, page: 1 })
       // 获取品名
       const allData = JSON.parse(res).bzhxList as Bzhx[]

entry/src/main/ets/pages/sub_systemMaintenance/DataSynchronism/modal/DjInfoModal.ets

@@ -7,7 +7,7 @@ import { getDjList, getQkdzList } from '../sync.api'
 import drModel from '../../../../model/DrModel'
 import { KfInfo } from '@ohos/common/src/main/ets/entity/KfInfo'
 import kfModel from '../../../../model/KfModel'
-import { pzlxList, pzlx_dict } from '@ohos/common/src/main/ets/utils/dict'
+import { pzlx_dict, pzlxList } from '@ohos/common/src/main/ets/utils/dict'
 import { Logger } from '@ohos/common/src/main/ets/utils/Logger'
 
 @Extend(Button) function CommonButtonStyle() {
@@ -110,13 +110,9 @@ export struct DjInfoModal {
 
 
     try {
-      this.showProgress = true
       this.controller.close()
-      await wzcrkModel.clear()
-      await wzcrkmxModel.clear()
-      await dsRfidModel.clear()
+      this.showProgress = true
       let rows = [] as any[]
-
       Logger.info('Logger.info>>', JSON.stringify(this.form))
       if (this.form.pzlx == '111111PZLX42') {
         const res = await getQkdzList({

entry/src/main/ets/pages/sub_systemMaintenance/DataSynchronism/modal/PageModal.ets

@@ -61,8 +61,6 @@ export struct PageModal {
 
       this.controller.close()
 
-      await bgglModel.clear()
-
       const res = await getBgList(this.form)
       // 获取包裹数据
       const bgData = JSON.parse(res) as Bggl[]