Merge remote-tracking branch 'origin/master'

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

@@ -67,4 +67,12 @@ export class BzhxDao extends BaseTable<Bzhx> {
     wp.orderByAsc('GUID').offsetAs(offset).limitAs(20);
     return this.query(wp, this.getTableColumns())
   }
+  async selectWZInfo(lsm?:string):Promise<Bzhx[]>{
+    let wp = this.getPredicates();
+    if (lsm) {
+      wp.equalTo('LSM', lsm);
+    }
+    wp.orderByAsc('LSM');
+    return this.query(wp, this.getTableColumns())
+  }
 }
\ No newline at end of file

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

@@ -53,4 +53,30 @@ export class DsRfidDao extends BaseTable<DsRfid> {
 						  )`;
     return count_sql;
   }
+  /*查询上架---sjType：0（待上架），1(已上架)*/
+  async getselectSJList(wzcrkguid: string,sjType:number): Promise<DsRfid[]> {
+    let wp = this.getPredicates();
+    if (wzcrkguid) {
+      wp.equalTo('WZCRKGUID', wzcrkguid);
+    }
+    if(sjType==0){
+      wp.equalTo("HWH","暂无")
+    }else {
+      wp.notEqualTo("HWH","暂无")
+    }
+    wp.orderByAsc('HWH');
+    return this.query(wp, this.getTableColumns())
+  }
+  /**
+   * 更新上架状态
+   */
+  async updateSJStatus(guid: string, hwh?: string): Promise<number> {
+    const valueBucket = {
+      "HWH": hwh
+    };
+    let wp = this.getPredicates()
+    wp.equalTo('guid', guid)
+    return this.updateData(valueBucket, wp)
+
+  }
 }
\ No newline at end of file

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

@@ -60,5 +60,12 @@ export class HwInfoDao extends BaseTable<HwInfo> {
     wp.orderByAsc('HWH');
     return this.query(wp, this.getTableColumns())
   }
-
+  async getselectHwList(kfguid: string): Promise<HwInfo[]> {
+    let wp = this.getPredicates();
+    if (kfguid) {
+      wp.equalTo('KFGUID', kfguid);
+    }
+    wp.orderByAsc('HWH');
+    return this.query(wp, this.getTableColumns())
+  }
 }
\ No newline at end of file

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

@@ -62,7 +62,7 @@ export class WzhxdmDao extends BaseTable<Wzhxdm> {
 
   async selectHXList(sql?: string): Promise<Wzhxdm[]> {
     let db = await this.futureDb;
-    let rs = await db.querySql('', []);
+    let rs = await db.querySql(sql, this.getTableColumns());
     let items: Wzhxdm[];
     if (rs.goToFirstRow()) {
       do {

entry/src/main/ets/identify/analysis/analysis_QR_code.ets

@@ -238,7 +238,7 @@ async function analysisQrCode(bqData:string, isData:boolean = false) {
   // 	"' or lsm = '" + hx_map["wzdm"] + "') " + " and ( pmdmten in (" + hx_map["pmdm_hxmc"] +
   // 	") or hxmc in (" + hx_map["pmdm_hxmc"] + ") or lsm in (" + hx_map["pmdm_hxmc"] + ")) ";
 
-  let sql = "select wzdm,hxdm,hxmc,lsm,wzpm from tab_xtwh_jcsj_wzhxdm where "+
+  let sql = "select wzdm,hxdm,hxmc,lsm,wzpm from TAB_XTWH_JCSJ_WZHXDM where "+
   " lsm = '" + hx_map["wzdm"] + "' " +
   " or lsm in (" + hx_map["pmdm_hxmc"] + ")"+
   " or pmdmten = '" + hx_map["wzdm"] + "' " +
@@ -255,8 +255,12 @@ async function analysisQrCode(bqData:string, isData:boolean = false) {
   // const allList = await selectInformationType("GY_M_PMV3", allsql)
   // const allList1 = await createOrFindSQL("GY_M_PMV3", allsql1)\
   bzhxModal.queryLsm(str)
-  console.log('sql', sql)
+  console.log('sql查询语句'+ sql)
   let wzdmList = await bzhxModal.queryHXlist(sql)
+  console.log('sql查询结果'+JSON.stringify(wzdmList))
+  if(!wzdmList){
+    wzdmList=[]
+  }
   for (let j = 0; j < wzdmList.length; j++) {
     let wzdm = wzdmList[j];
     Object.keys(hx_map).forEach((item) => {

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

@@ -26,8 +26,8 @@ class BzhxModel {
     let res = await SQLiteContext.with(BzhxDao).getBzhxList(offset, pmdmsix, pmdmten)
     return res;
   }
-  async queryLsm(lsm?: string):Promise<Wzdm[]> {
-    let res = await SQLiteContext.with(WzdmDao).selectWZDM(lsm);
+  async queryLsm(lsm?: string):Promise<Bzhx[]> {
+    let res = await SQLiteContext.with(BzhxDao).selectWZInfo(lsm);
     Logger.info("查询LSM结果"+JSON.stringify(res))
     return res;
   }

entry/src/main/ets/model/DsRfidModel.ets

@@ -6,6 +6,20 @@ class DsRfidModel {
     data.guid=uuid()
     await SQLiteContext.with(DsRfidDao).insert(data)
   }
+  // 查询待上架
+  async queryDSJ(wzcrkguid? : string,sjType?:number): Promise<DsRfid[]> {
+    let res = await SQLiteContext.with(DsRfidDao).getselectSJList(wzcrkguid,sjType)
+    return res;
+  }
+  // 查询已上架
+  async queryYSJ(wzcrkguid? : string,sjType?:number): Promise<DsRfid[]> {
+    let res = await SQLiteContext.with(DsRfidDao).getselectSJList(wzcrkguid,sjType)
+    return res;
+  }
+  async updateSJStatus(guid: string, hwh: string):Promise<number> {
+    let res = await SQLiteContext.with(DsRfidDao).updateSJStatus(guid, hwh)
+    return res;
+  }
 }
 const dsRfidModel = new DsRfidModel()
 

entry/src/main/ets/model/HwModel.ets

@@ -12,6 +12,11 @@ class HwModel {
     let res = await SQLiteContext.with(HwInfoDao).getHwList(no)
     return res;
   }
+  // 查询库房下货位
+  async queryHw(kfguid? : string): Promise<HwInfo[]> {
+    let res = await SQLiteContext.with(HwInfoDao).getselectHwList(kfguid)
+    return res;
+  }
   // 清空表
   async clear() {
     await SQLiteContext.with(HwInfoDao).clearTable()

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

 import { TitleBar } from '../../view/title/TitleBar'
 import promptAction from '@ohos.promptAction'
+import hwModel from "../../model/HwModel"
+import { HwInfo, SQLiteContext, HwInfoDao,Logger} from '@ohos/common'
+import dsRfidModel from '../../model/DsRfidModel';
+import router from '@ohos.router'
 
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
@@ -10,20 +14,54 @@ import promptAction from '@ohos.promptAction'
   .type(ButtonType.Normal)
   .stateEffect(true)
 }
-
-
 @Entry
 @Component
 struct GoodsSelectHwPage{
   @State model: boolean = true
+  @State hwInfoList:HwInfo[]=[]
+  @State selectValue:Array<SelectOption>=[]
+  @State checkedList: Array<string> = []
+  @State hwh:string=""
+  aboutToAppear(){
+    this.checkedList= router.getParams() as string[];
+    this.getHwList()
+  }
+  async getHwList(){
+     this.hwInfoList=await hwModel.queryHw("")
+    this.selectValue=this.hwInfoList.map(item =>{
+       return {value:item.hwh}
+    })
+  }
+  /*手动保存*/
+  onSubmit() {
+    try {
+      Logger.info("选择上架数据===》"+JSON.stringify(this.checkedList))
+      this.checkedList.forEach(async (element) => {
+        let num = await dsRfidModel.updateSJStatus(element, this.hwh)
+        if (num) {// 如果更新成功就减少
+          promptAction.showToast({
+            message: "保存成功"
+          })
+        }else{
+          promptAction.showToast({
+            message: "保存失败"
+          })
+        }
+      })
+    } catch (e) {
 
+    } finally {
+      router.back()
+      this.checkedList = []
+    }
+  }
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
         TitleBar({ title: "货位"})
         Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
           Column() {
-            Select([{ value: "LS-1-1-2" }, { value: "LS-1-1-3" }, { value: "LS-1-1-4" }])
+            Select(this.selectValue)
               .value('请选择')
               .borderWidth(1)
               .borderRadius(6)
@@ -34,7 +72,7 @@ struct GoodsSelectHwPage{
               .borderColor("#e5e5e5")
               .width(220)
               .onSelect((index: number, value?: string) => {
-
+                this.hwh=value
               })
           }.visibility(this.model?Visibility.Visible:Visibility.Hidden).width('70%').margin({ right: 10 })
 
@@ -52,7 +90,7 @@ struct GoodsSelectHwPage{
           if (this.model) {
 
           } else {
-            Flex({ justifyContent: FlexAlign.Center , alignItems: ItemAlign.Center }) {
+            Flex({ justifyContent: FlexAlign.Center , alignItems: ItemAlign.Center}) {
               Text('请扫描货位码').fontColor('#fff').fontSize(20)
             }
             .width('100%')
@@ -72,14 +110,10 @@ struct GoodsSelectHwPage{
             .fontColor('#0fa983')
             .backgroundColor('#fff')
             .onClick(() => {
-              promptAction.showToast({
-                message: "保存"
-              })
+              this.onSubmit()
             })
         }
         .height(70)
-
-
       }.width("100%")
     }.linearGradient({
       direction: GradientDirection.Right, // 渐变方向

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

@@ -61,11 +61,6 @@ export struct WzInPage {
     this.getWzcrkList()
   }
 
-  ininData() {
-    this.checkedList = []
-    this.getWzcrkList()
-  }
-
   async getWzcrkList(qzh?: number, wczt?: string) {
     Logger.info('出入库传入参数>>:', JSON.stringify(this.searchData))
     this.dataSource = []
@@ -75,10 +70,7 @@ export struct WzInPage {
     res.forEach(element => {
       this.dataSource.push(new WzinClass(element))
     });
-    // for (let index = 0; index < res.length; index++) {
-    //   const element = res[index];
-    //   this.dataSource.push(new WzinClass(element))
-    // }
+    Logger.info('数量是' + JSON.stringify(this.dataSource))
   }
 
   @Builder container() {
@@ -111,6 +103,7 @@ export struct WzInPage {
       cancel: this.onCancel,
       confirm: this.onSubmit,
       checkedList: $checkedList,
+      dataSource: $dataSource,
       container: this.container
     }),
     autoCancel: true,
@@ -127,13 +120,13 @@ export struct WzInPage {
       this.checkedList.forEach(async (element) => {
         let num = await wzcrkModel.updateWzcrkWczt(element, this.radioChecked ? '已完成' : '未完成')
         if (num) {// 如果更新成功就减少
-          this.dataSource = this.dataSource.filter(i => i.guid != element)
+          Logger.info("删除的数据是：" + JSON.stringify(this.dataSource))
+          this.dataSource.splice(this.dataSource.findIndex(i => i.guid == element), 1)
         }
       })
     } catch (e) {
 
     } finally {
-
       this.checkedList = []
     }
   }

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

@@ -24,7 +24,7 @@ interface params {
 /*入库详情*/
 @Entry
 @Component
-struct PzInOutDetailPage{
+struct WzinDetail{
   @State fontColor: string = '#0FA983'
   @State selectedFontColor: string = '#fff'
   @State currentIndex: number = 0

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

@@ -19,6 +19,7 @@ import bgglModel from '../../../model/BgglModel'
 import wzdmModel from '../../../model/WzdmModel'
 import drModel from '../../../model/DrModel'
 import { DrInfo } from '@ohos/common/src/main/ets/entity/DrInfo'
+import wzcrkmxModel from '../../../model/WzcrkmxModel'
 
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
@@ -57,6 +58,7 @@ export struct Pmhx {
   listController: CustomDialogController = new CustomDialogController({
     builder: ListDialog({
       cancel: this.onCancel,
+      getDrData: this.getDrData
     }),
     autoCancel: true,
     alignment: DialogAlignment.Bottom,
@@ -77,7 +79,7 @@ export struct Pmhx {
     console.log("onSubmit")
   }
 
-  aboutToAppear(){
+  aboutToAppear() {
     this.getDrData()
   }
 
@@ -94,6 +96,11 @@ export struct Pmhx {
       case "基础信息":
         try {
           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[]
@@ -142,6 +149,8 @@ export struct Pmhx {
       case "单据导入":
         try {
           this.showProgress = true
+          await wzcrkModel.clear()
+          await wzcrkmxModel.clear()
           const { rows } = await getDjList({})
           // 使用map对rows进行操作
           const mappedRows = rows.map((row) => {
@@ -193,6 +202,7 @@ export struct Pmhx {
       case "订单导入":
         try {
           this.showProgress = true
+          await bgglModel.clear()
           const res = await getBgList({})
           // 获取包裹数据
           const bgData = JSON.parse(res) as Bggl[]
@@ -257,18 +267,20 @@ export struct Pmhx {
       Column() {
         Row() {
           Text("当前数据导入版本:").fontSize(12).fontColor("#0fa983")
-          Text("暂无").fontSize(12).fontColor("#0fa983")
-        }
-        List(){
-          ForEach(this.drData,(item: DrInfo) => {
-            ListItem(){
-              Column(){
-                Text(item.filename).fontSize(11)
-                Text(item.time).fontSize(10).fontSize('#858383')
-              }
+          Text("暂无").fontSize(12).fontColor("#0fa983").margin({ left: 20 })
+        }.margin({ top: 5 })
+
+        List() {
+          ForEach(this.drData, (item: DrInfo) => {
+            ListItem() {
+              Column() {
+                Text(item.filename).fontSize(12).alignSelf(ItemAlign.Start).padding({ top: 6, bottom: 3 })
+                Text(item.time).fontSize(10).padding({ bottom: 4 }).fontColor('#8a919f').alignSelf(ItemAlign.Start)
+              }.margin({ left: 8 })
             }
           })
-        }
+        }.divider({ strokeWidth: 1, color: "#afb5c0" }).margin({ top: 6 })
+
       }.border({ width: 1, color: 0x0fa983, radius: 2, style: BorderStyle.Dotted })
       .height("92%").width('92%').margin({ top: 12 })
     }

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

@@ -11,12 +11,14 @@ import kfModel from '../../../model/KfModel'
 import hwModel from '../../../model/HwModel'
 import hjModel from '../../../model/HjModel'
 import gldwModel from '../../../model/GldwModel'
+import drModel from '../../../model/DrModel'
 
 @CustomDialog
 @Component
 export struct ListDialog {
   cancel: () => void
   @State content: string = ''
+  getDrData: () => void
   dialogController: CustomDialogController = new CustomDialogController({
     builder: TipDialog({
       cancel: this.onCancel,
@@ -41,11 +43,13 @@ export struct ListDialog {
 
       case '是否确定清除基础数据':
         try {
-          qyModel.clear();
-          kfModel.clear();
-          hwModel.clear();
-          hjModel.clear();
-          gldwModel.clear();
+          await qyModel.clear();
+          await kfModel.clear();
+          await hwModel.clear();
+          await hjModel.clear();
+          await gldwModel.clear();
+          await await drModel.set('清除基础数据')
+          await  this.getDrData()
           promptAction.showToast({
             message: '清除基础数据成功'
           })
@@ -57,8 +61,10 @@ export struct ListDialog {
 
       case '是否确认清除单据数据':
         try {
-          wzcrkModel.clear()
-          wzcrkmxModel.clear()
+          await wzcrkModel.clear()
+          await wzcrkmxModel.clear()
+          await drModel.set('清除单据数据')
+          // await  this.getDrData()
           promptAction.showToast({
             message: '清除单据数据成功'
           })
@@ -71,7 +77,9 @@ export struct ListDialog {
 
       case '是否确认清除包裹数据':
         try {
-          bgglModel.clear()
+          await bgglModel.clear()
+          await drModel.set('清除包裹数据')
+          await  this.getDrData()
           promptAction.showToast({
             message: '清除包裹数据成功'
           })
@@ -84,7 +92,9 @@ export struct ListDialog {
 
       case '是否确认清除品名及号型数据':
         try {
-          bzhxModel.clear()
+          await  bzhxModel.clear()
+          await drModel.set('清除品名及号型')
+          await  this.getDrData()
           promptAction.showToast({
             message: '清除品名及号型数据成功'
           })
@@ -95,6 +105,21 @@ export struct ListDialog {
         }
         break;
 
+      case '是否确认清除导入导出数据':
+        try {
+          await  drModel.clear()
+          await drModel.set('清除导入导出数据')
+          await  this.getDrData()
+          promptAction.showToast({
+            message: '清除导入导出数据成功'
+          })
+        } catch (e) {
+          promptAction.showToast({
+            message: '清除导入导出数据失败'
+          })
+        }
+        break;
+
       default:
         break;
     }

entry/src/main/ets/view/SetStatusDialog/SetStatusDialog.ets

 import { UniListItem } from '@ohos/system/src/main/ets/model/UniInitList';
+import { WzinClass } from '../../pages/metailmange/WzInPage/Wzin.data';
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
   .borderColor('#0fa983')
@@ -31,7 +32,7 @@ interface FormData {
 @CustomDialog
 @Component
 export struct SetStatusDialog {
-
+  @Link dataSource: WzinClass[]
   @Link checkedList: Array<string>
   controller: CustomDialogController
   cancel: () => void
@@ -39,6 +40,7 @@ export struct SetStatusDialog {
 
   @BuilderParam container: () => void
 
+
   build() {
     Column() {
       Flex({ alignItems: ItemAlign.Start }) {