Skip to content

J
jump_hm_warehouse
Commit 69e75a13 by huangqy
Options

移动文件位置

parent 633299df
正在显示 包含 115 行增加 和 49 行删除
entry/src/main/ets/pages/metailmange/WzInPage/Wzin.data.ets → entry/src/main/ets/pages/metailmange/Common/Wzcrk.data.ets
import { pzlx_dict, szlx_dict,new_zmlx_dict, Logger } from '@ohos/common'
@Observed
export class WzinClass {
export class WzClass {
guid?: string
/**
* 工作年度
......@@ -204,7 +204,7 @@ export class WzmxClass {
*/
pmdmSix:string
/**
* 物资状态
* 完成状态
*/
wczt:string
......
entry/src/main/ets/pages/metailmange/WzInPage/WzInList.ets → entry/src/main/ets/pages/metailmange/Common/WzcrkList.ets
import { WzinClass,renderPzlx } from './Wzin.data'
import { WzClass,renderPzlx } from './Wzcrk.data'
@Component
export struct WzInList {
@ObjectLink item: WzinClass
export struct WzList {
@ObjectLink item: WzClass
@Link checkedList: Array<string>
build() {
......
entry/src/main/ets/pages/metailmange/WzInPage/WzInPage.ets
import { TitleBar } from '../../../view/title/TitleBar'
import router from '@ohos.router';
import { WzInList } from './WzInList';
import { WzList } from '../Common/WzcrkList';
import wzcrkModel from '../../../model/WzcrkModel';
import { Logger } from '@ohos/common/src/main/ets/utils/Logger';
import { WzinClass } from './Wzin.data'
import { WzClass } from '../Common/Wzcrk.data'
import promptAction from '@ohos.promptAction';
import { SetStatusDialog } from '../../../view/SetStatusDialog/SetStatusDialog';
import { ExportOrderDialog } from '../../../view/ExportOrderDialog/ExportOrderDialog';
import ViewdrdcModel from '../../../model/ViewdrdcModel';
import { ViewdrdcDao } from '@ohos/common/src/main/ets/db/dao/ViewdrdcDao';
import defHttp from '@ohos/common/src/main/ets/utils/HttpUtil';
import { importData } from './wzIn.api';
import { importData } from '../Common/Wzcrk.api';
import { dateUtils } from '@ohos/common/src/main/ets/utils/util';
@Extend(Button) function bottomBtnSty() {
.borderWidth(1)
......@@ -34,7 +33,7 @@ export struct WzInPage {
@State fontColor: string = '#182431'
@State selectedFontColor: string = '#fff'
@State currentIndex: number = 0
@State dataSource: WzinClass[] = []
@State dataSource: WzClass[] = []
@State checkedList: Array<string> = []
@State radioChecked: boolean = true
@State searchData: SearchData = {
......@@ -69,11 +68,11 @@ export struct WzInPage {
async getWzcrkList(qzh?: number, wczt?: string) {
Logger.info('出入库传入参数>>:', JSON.stringify(this.searchData))
this.dataSource = []
const res = await wzcrkModel.query({ crklx: "2", pzh: Number(this.searchData.pzh) , wczt: this.searchData.wczt, sjlx: this.currentIndex === 0 ? "导入" : "临时收物" })
const res = await wzcrkModel.query({ pzlx: "14", pzh: Number(this.searchData.pzh), wczt: this.searchData.wczt, sjlx: this.currentIndex === 0 ? "导入" : "临时收物" })
Logger.info('出入库数据>>:', JSON.stringify(res))
Logger.info('出入库数据长度>>:', JSON.stringify(res.length))
res.forEach(element => {
this.dataSource.push(new WzinClass(element))
this.dataSource.push(new WzClass(element))
});
Logger.info('数量是' + JSON.stringify(this.dataSource))
}
......@@ -84,7 +83,7 @@ export struct WzInPage {
Flex({ justifyContent: FlexAlign.SpaceBetween }) {
Text('完成').margin({ left: 20 })
Radio({ value: 'Radio1', group: 'radioGroup' })
.checked(this.radioChecked)
.checked(true)
.onChange((isChecked: boolean) => {
this.radioChecked = isChecked
}).margin({ right: 20 })
......@@ -95,7 +94,7 @@ export struct WzInPage {
Row() {
Flex({ justifyContent: FlexAlign.SpaceBetween }) {
Text('未完成').margin({ left: 20 })
Radio({ value: 'Radio1', group: 'radioGroup' })
Radio({ value: 'Radio2', group: 'radioGroup' })
.onChange((isChecked: boolean) => {
}).margin({ right: 20 })
}
......@@ -132,7 +131,7 @@ export struct WzInPage {
onSubmit() {
try{
this.checkedList.forEach(async (element)=>{
let num = await wzcrkModel.updateWzcrkWczt(element, this.radioChecked ? '已完成' : '未完成')
let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '已完成' : '未完成'))
if(num){
Logger.info("删除的数据是：" + JSON.stringify(this.dataSource))
this.dataSource.splice(this.dataSource.findIndex(i => i.guid == element), 1)
......@@ -166,10 +165,9 @@ export struct WzInPage {
this.checkedList.forEach(async element => {
let res = await ViewdrdcModel.queryExport({guid: element, wczt: '已完成', pzlx: '14'})
const jhguidArr = res.map((item) => item.guid)
Logger.info('导出数据0：', JSON.stringify(jhguidArr))
if (jhguidArr && jhguidArr.length > 0) {
const date = dateUtils.formatDateTime(new Date(), 'before')
const newArr = [...new Set(jhguidArr)]
Logger.info('导出数据1：', JSON.stringify(newArr))
const exportData = newArr.map((item) => {
let newObj = {}
let ItemData = []
......@@ -185,38 +183,43 @@ export struct WzInPage {
})
}
})
Logger.info('导出数据2：', JSON.stringify(ItemData))
const [filterData] = res.filter((fItem) => fItem
.guid == item)
Logger.info('>>>>>>>kkkll:' + JSON.stringify(filterData))
if (filterData) {
newObj = {
cbdwdm: filterData.ckdwguid,
ckkfdm: filterData.kfdm,
...filterData,
crksl: ItemData.map(i => i.sjsl).reduce((a, b) => {
return a + b
},0),
scjid: "863576927543400,863576927543400",
cjmc: "普华",
imei: "863576927543400,863576927543400",
model: "ax6737_65_n",
vendor: "alps",
dcsj: "2024年01月20日",
dcsj: date,
pzmx: ItemData
}
}
return newObj
})
Logger.info('导出数据3：', JSON.stringify(exportData))
const kkkk = {
const exportForm = {
pzzbJson: exportData,
crklx: '11111CRKLX2',
gznd: '2023',
jsdwguid: 1,
}
await importData(kkkk)
await importData(exportForm)
}
})
promptAction.showToast({
message: '导出'
promptAction.showDialog({
title: '提示',
message: '入库作业单据已同步至业务系统，请以保管员身份登录业务系统，在菜单“作业项目--物资入库”里刷新查看。',
buttons: [{
text: '已知晓',
color: '#0fa983',
}],
})
}
......@@ -391,7 +394,7 @@ export struct WzInPage {
List({ space: 2 }) {
ForEach(this.dataSource, (item) => {
ListItem() {
WzInList({ item, checkedList: $checkedList }).width('100%').backgroundColor('#fff')
WzList({ item, checkedList: $checkedList }).width('100%').backgroundColor('#fff')
}.onClick(() => {
router.pushUrl({ url: 'pages/metailmange/WzInPage/WzinDetail/WzinDetail', params: {
wzcrk: item
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/AddWzin.ets
import gldwModel from '../../../../model/GldwModel'
import kfModel from '../../../../model/KfModel'
import { renderPzlx, renderSzlx, renderZmlx, WzinClass } from '../Wzin.data'
import { renderPzlx, renderSzlx, renderZmlx, WzinClass } from '../../Common/Wzcrk.data'
@Entry
@Component
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/LeftDialog.ets
import { WzmxClass } from '../Wzin.data'
import { WzmxClass } from '../../Common/Wzcrk.data'
@CustomDialog
@Component
export struct LeftDialog {
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/PzInfo.ets
import gldwModel from '../../../../model/GldwModel'
import kfModel from '../../../../model/KfModel'
import { renderPzlx, renderSzlx, renderZmlx, WzinClass } from '../Wzin.data'
import { renderPzlx, renderSzlx, renderZmlx, WzClass } from '../../Common/Wzcrk.data'
@Component
// 物资信息
export struct PzInfo {
@State kfmc: string = ''
@State fwgldw: string = ''
@State swgldw: string = ''
@ObjectLink wzcrk: WzinClass
@ObjectLink wzcrk: WzClass
arr = [{ title: "凭证类型", key: 'pzlx', enabled: false },
{ title: "凭证号", key: 'pzh', enabled: false },
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/PzInfo2.ets
import { Logger } from '@ohos/common/src/main/ets/utils/Logger'
import gldwModel from '../../../../model/GldwModel'
import kfModel from '../../../../model/KfModel'
import { renderPzlx, renderSzlx, renderZmlx, WzinClass } from '../Wzin.data'
import { renderPzlx, renderSzlx, renderZmlx, WzinClass } from '../../Common/Wzcrk.data'
// @Observed
class Options {
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzInfo.ets
......@@ -3,7 +3,7 @@ import { Logger } from '@ohos/common';
import { Wzcrkmx } from '@ohos/common/src/main/ets/entity/Wzcrkmx';
import gldwModel from '../../../../model/GldwModel';
import kfModel from '../../../../model/KfModel';
import { WzinClass, WzmxClass } from '../Wzin.data';
import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
import { WzList } from './WzList';
@Extend(Button) function CommonButtonStyle() {
......@@ -23,7 +23,7 @@ export struct WzInfo {
@State kfmc: string = ''
@State sfdw: string = ''
@State private wzmx: WzmxClass[] = []
@ObjectLink wzcrk: WzinClass
@ObjectLink wzcrk: WzClass
getDetail: (wzpm?:string) => void
aboutToAppear(){
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzList.ets
import { Logger } from '@ohos/common/src/main/ets/utils/Logger'
import { WzmxClass } from '../Wzin.data'
import { WzmxClass } from '../../Common/Wzcrk.data'
@Component
export struct WzList {
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzinDetail.ets
......@@ -5,7 +5,7 @@ import { Wzcrk } from '@ohos/common/src/main/ets/entity/Wzcrk';
import { WzInfo } from './WzInfo'
import { PzInfo } from './PzInfo'
import wzcrkmxModel from '../../../../model/WzcrkmxModel';
import { WzinClass, WzmxClass } from '../Wzin.data';
import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
import bzhxModel from '../../../../model/BzhxModel';
import promptAction from '@ohos.promptAction';
import wzcrkModel from '../../../../model/WzcrkModel';
......@@ -30,14 +30,14 @@ struct WzinDetail {
@State fontColor: string = '#0FA983'
@State selectedFontColor: string = '#fff'
@State currentIndex: number = 0
@State wzcrk: WzinClass = null // 物资出入库单据信息
@State wzcrk: WzClass = null // 物资出入库单据信息
@State wzmx: WzmxClass[] = [] // 物资出入库明细
private controller: TabsController = new TabsController()
onPageShow() {
const params = router.getParams() as params
this.wzcrk = new WzinClass(params.wzcrk)
this.wzcrk = new WzClass(params.wzcrk)
Logger.info('接收到出入库信息>>', JSON.stringify(params.wzcrk))
this.getDetail()
}
......
entry/src/main/ets/pages/metailmange/WzOutPage.ets → entry/src/main/ets/pages/metailmange/WzOutPage/WzOutPage.ets
import { TitleBar } from '../../view/title/TitleBar'
import { Demo } from '../../view/demo/demo';
import { TitleBar } from '../../../view/title/TitleBar'
import router from '@ohos.router';
import wzcrkModel from '../../../model/WzcrkModel';
import { Logger } from '@ohos/common';
import { WzClass } from '../Common/Wzcrk.data';
import { WzList } from '../Common/WzcrkList';
@Extend(Button) function bottomBtnSty() {
.borderWidth(1)
.padding({top:1,bottom:1,right:7,left:7})
......@@ -12,18 +16,46 @@ import router from '@ohos.router';
.stateEffect(true)
}
interface SearchData {
pzh?: string;
wczt?: string;
}
@Entry
@Component
export struct WzOutPage {
@State fontColor: string = '#182431'
@State selectedFontColor: string = '#fff'
@State currentIndex: number = 0
@State dataSource: WzClass[] = []
@State checkedList: Array<string> = []
@State radioChecked: boolean = true
@State searchData: SearchData = {
pzh: '',
wczt: '未完成'
}
private controller: TabsController = new TabsController()
private searchcontroller: SearchController = new SearchController()
private searchcontroller: SearchController = new SearchController()
itemClick() {
router.pushUrl({url:'pages/order_detail/PzInOutDetailPage'})
}
aboutToAppear() {
this.getWzcrkList()
}
async getWzcrkList(qzh?: number, wczt?: string) {
this.dataSource = []
const res = await wzcrkModel.query({ pzlx: "17",
pzh: Number(this.searchData.pzh),
wczt: this.searchData.wczt,
sjlx: this.currentIndex === 0 ? "导入" : "临时发物" })
res.forEach(element => {
this.dataSource.push(new WzClass(element))
});
Logger.info('数量是' + JSON.stringify(this.dataSource))
}
@Builder TabBuilder(index: number, name: string) {
Column() {
Text(name)
......@@ -38,6 +70,16 @@ export struct WzOutPage {
.opacity(this.currentIndex === index ? 1 : 0)
}.width('100%')
}
@Builder renderEmpty() {
Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
Column() {
Image($r("app.media.empty")).width("42%")
Text("暂无数据").fontSize(22).fontColor("#fff").margin({ top: 5 })
}
}.height('70%')
}
@Builder bottomButtons() {
Row() {
Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
......@@ -119,9 +161,30 @@ export struct WzOutPage {
this.currentIndex = index
})
// 列表
// 列表
Column() {
Demo({itemClick: this.itemClick}).width('90%')
}.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
if (this.dataSource.length == 0) {
this.renderEmpty()
} else {
List({ space: 2 }) {
ForEach(this.dataSource, (item) => {
ListItem() {
WzList({ item, checkedList: $checkedList }).width('100%').backgroundColor('#fff')
}.onClick(() => {
router.pushUrl({ url: 'pages/metailmange/WzInPage/WzinDetail/WzinDetail', params: {
wzcrk: item
} },)
})
})
}.padding(18)
}
}.flexGrow(1).alignSelf(ItemAlign.Center)
Row(){
// 底部按钮
this.bottomButtons();
......
entry/src/main/ets/pages/metailmange/WzStatus.ets
import { LeftDialog } from '../metailmange/WzInPage/WzinDetail/LeftDialog'
import { TitleBar } from '../../view/title/TitleBar'
import router from '@ohos.router'
import { WzmxClass } from './WzInPage/Wzin.data'
import { WzmxClass } from './Common/Wzcrk.data'
@Extend(Button) function CommonButtonStyle() {
.borderWidth(2)
......
entry/src/main/ets/view/ExportOrderDialog/ExportOrderDialog.ets
import { UniListItem } from '@ohos/system/src/main/ets/model/UniInitList';
import { WzinClass } from '../../pages/metailmange/WzInPage/Wzin.data';
import { WzClass } from '../../pages/metailmange/Common/Wzcrk.data';
@Extend(Button) function CommonButtonStyle() {
.borderWidth(2)
.borderColor('#0fa983')
......@@ -32,7 +32,7 @@ interface FormData {
@CustomDialog
@Component
export struct ExportOrderDialog {
@Link dataSource: WzinClass[]
@Link dataSource: WzClass[]
@Link checkedList: Array<string>
controller: CustomDialogController
cancel: () => void
......
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';
import { WzClass } from '../../pages/metailmange/Common/Wzcrk.data';
@Extend(Button) function CommonButtonStyle() {
.borderWidth(2)
.borderColor('#0fa983')
......@@ -32,7 +32,7 @@ interface FormData {
@CustomDialog
@Component
export struct SetStatusDialog {
@Link dataSource: WzinClass[]
@Link dataSource: WzClass[]
@Link checkedList: Array<string>
controller: CustomDialogController
cancel: () => void
......
entry/src/main/resources/base/profile/main_pages.json
......@@ -5,7 +5,7 @@
"pages/package/Pick",
"pages/package/Pack",
"pages/metailmange/WzInPage/WzInPage",
"pages/metailmange/WzOutPage",
"pages/metailmange/WzOutPage/WzOutPage",
"pages/metailmange/WzExchangePage",
"pages/metailmange/WzConversionPage",
"pages/metailmange/WzInvPage",
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论