Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jump_hm_warehouse
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Members
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
毛勇泽
jump_hm_warehouse
Commits
dde23e4a
Commit
dde23e4a
authored
Jan 24, 2024
by
huangqy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wzinfo
parent
d510de8c
全部展开
显示空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
421 行增加
和
285 行删除
+421
-285
HwDetailDialog.ets
entry/src/main/ets/pages/metailmange/Common/Dialog/HwDetailDialog.ets
+22
-0
WzScanInfoDialog.ets
entry/src/main/ets/pages/metailmange/Common/Dialog/WzScanInfoDialog.ets
+59
-0
WzInfo.ets
entry/src/main/ets/pages/metailmange/Common/WzInfo.ets
+265
-0
action.ts
entry/src/main/ets/pages/metailmange/Common/action.ts
+14
-0
WzInfo.ets
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzInfo.ets
+0
-139
WzinDetail.ets
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzinDetail.ets
+2
-2
WzInvDetail.ets
entry/src/main/ets/pages/metailmange/WzInvPage/WzInvDetail/WzInvDetail.ets
+1
-1
WzInfo.ets
entry/src/main/ets/pages/metailmange/WzOutPage/WzOutDetail/WzInfo.ets
+0
-139
WzList.ets
entry/src/main/ets/pages/metailmange/WzOutPage/WzOutDetail/WzList.ets
+53
-0
WzOutDetail.ets
entry/src/main/ets/pages/metailmange/WzOutPage/WzOutDetail/WzOutDetail.ets
+2
-2
WzOutPage.ets
entry/src/main/ets/pages/metailmange/WzOutPage/WzOutPage.ets
+1
-1
main_pages.json
entry/src/main/resources/base/profile/main_pages.json
+2
-1
close.png
entry/src/main/resources/rawfile/scan/close.png
+0
-0
eye.png
entry/src/main/resources/rawfile/scan/eye.png
+0
-0
没有找到文件。
entry/src/main/ets/pages/metailmange/Common/Dialog/HwDetailDialog.ets
0 → 100644
View file @
dde23e4a
import { DividerTitle } from '../../../../view/DividerTitle/DividerTitle'
@CustomDialog
@Component
export struct HwDetailDialog {
controller: CustomDialogController
build() {
Column() {
Flex({ justifyContent: FlexAlign.Start }) {
DividerTitle({title: "推荐货位"})
.padding({ top: 10, bottom: 10 })
}.padding(15)
}
.width('50%')
.height('100%')
.borderRadius(5)
.backgroundColor('#fff')
}
}
\ No newline at end of file
entry/src/main/ets/pages/metailmange/Common/Dialog/WzScanInfoDialog.ets
0 → 100644
View file @
dde23e4a
import { DividerTitle } from '../../../../view/DividerTitle/DividerTitle'
import { HwDetailDialog } from './HwDetailDialog'
@CustomDialog
@Component
export struct WzScanInfoDialog {
controller: CustomDialogController
@Link defaultHwh: string
@Link pageType: string
@Link currentHwh: string
@Link currentWZInfo: Array<any>
handleDefaultHwDetail: () => void
@BuilderParam container: () => void
// hwDetailDialog: CustomDialogController = new CustomDialogController({
// builder: HwDetailDialog(),
// autoCancel: true,
// alignment: DialogAlignment.Default,
// customStyle: true
// })
//
//
// handleDefaultHwDetail() {
// if (this.hwDetailDialog != undefined) {
// this.hwDetailDialog.open()
// }
// }
build() {
Column() {
Flex({ justifyContent: FlexAlign.SpaceBetween }) {
DividerTitle({title: "扫描信息"})
.padding({ top: 10, bottom: 10 })
Image($rawfile('scan/close.png'))
.width(28)
.height(28)
.onClick(() => {
this.controller.close()
})
}.padding(15)
this.container()
Flex({ justifyContent: FlexAlign.SpaceBetween }) {
Text("推荐货位: " + this.defaultHwh).fontSize(16).lineHeight(18)
Image($rawfile("scan/eye.png")).width(24).height(24).onClick(() => {
// if (this.hwDetailDialog != undefined) {
// this.hwDetailDialog.open()
// }
})
}.padding(15)
}
.margin({top: 80})
.width('100%')
.borderRadius(5)
.backgroundColor('#fff')
}
}
\ No newline at end of file
entry/src/main/ets/pages/metailmange/Common/WzInfo.ets
0 → 100644
View file @
dde23e4a
差异被折叠。
点击展开。
entry/src/main/ets/pages/metailmange/Common/action.ts
0 → 100644
View file @
dde23e4a
// 菜单数据
export
interface
pzForm
{
pzlx
:
string
,
pzh
:
string
,
kfdm
:
string
,
pzszlx
:
string
,
sfdw
:
string
,
hwh
:
string
,
ydh
:
string
,
fwgldwdm
:
string
,
swgldwdm
:
string
,
dec
:
string
}
\ No newline at end of file
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzInfo.ets
deleted
100644 → 0
View file @
d510de8c
import router from '@ohos.router';
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 { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
import { WzList } from './WzList';
@Extend(Button) function CommonButtonStyle() {
.borderWidth(2)
.borderColor('#0fa983')
.backgroundColor('#97c6a6')
.fontColor('#fff')
.borderRadius(5)
.type(ButtonType.Normal)
.stateEffect(true)
}
@Component
// 物资信息
export struct WzInfo {
private searchcontroller: SearchController = new SearchController()
@State kfmc: string = ''
@State sfdw: string = ''
@State wzmx: WzmxClass[] = []
@ObjectLink wzcrk: WzClass
getDetail: (wzpm?:string) => void
aboutToAppear(){
this.getData()
}
async getData() {
const res = await kfModel.query({guid: this.wzcrk.kfguid})
this.kfmc = res[0].kfmc ?? ''
const res1 = await gldwModel.queryByData({dwdm:this.wzcrk.sfdw})
this.sfdw = res1[0].dwfh ?? ''
}
build() {
Column() {
Flex({ direction: FlexDirection.Column }) {
Column() {
Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
Row() {
Divider()
.vertical(true)
.height(14)
.strokeWidth(3)
.color('#19ac88')
.opacity(0.6)
.margin({ left: 8, right: 8 })
Text("单位/库房信息")
.fontWeight(FontWeight.Medium)
.fontSize(14)
.fontColor($r("app.color.item_color_black"))
}
.width("35%")
Text(this.sfdw + this.kfmc)
.fontWeight(FontWeight.Medium)
.fontSize(21)
.fontColor($r("app.color.title_background"))
.width("60%")
.textAlign(TextAlign.Start)
.padding({ bottom: 20, top: 20 })
}.width("100%")
}.padding({ bottom: 20, top: 20 })
.borderRadius(5)
.width("100%")
.backgroundColor("#fff")
Flex({ direction: FlexDirection.Column }) {
Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
Row() {
Divider()
.vertical(true)
.height(14)
.strokeWidth(3)
.color('#19ac88')
.opacity(0.6)
.margin({ left: 8, right: 8 })
Text("物资列表")
.fontWeight(FontWeight.Medium)
.fontSize(14)
.fontColor($r("app.color.item_color_black"))
}
}.padding({ left: 2, right: 10 })
.width("100%")
Row() {
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) => {
})
.margin({ left: 10 })
.borderRadius(5)
Button("查看状态").CommonButtonStyle().width("25%").margin({ left: 5, right: 5 }).onClick(() => {
router.pushUrl({ url: 'pages/metailmange/WzStatus', params: {
wzmx: this.wzmx
} })
})
}.width("100%")
}.padding({ top: 10, bottom: 10 }).width("100%")
Column() {
List() {
ForEach(this.wzmx, (item) => {
ListItem() {
WzList({ wzmx: item })
}
})
}
}.flexGrow(1)
}
.padding({ bottom: 20, top: 20 })
.borderRadius(15)
.margin({ top: 20 })
.width("100%")
.backgroundColor("#fff")
}
.width("100%")
.height("100%")
}
}
}
\ No newline at end of file
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzinDetail.ets
View file @
dde23e4a
...
...
@@ -2,7 +2,7 @@ import { TitleBar } from '../../../../view/title/TitleBar'
import router from '@ohos.router';
import { Logger } from '@ohos/common/src/main/ets/utils/Logger';
import { Wzcrk } from '@ohos/common/src/main/ets/entity/Wzcrk';
import { WzInfo } from './WzInfo'
import { WzInfo } from '.
./../Common
/WzInfo'
import { PzInfo } from './PzInfo'
import wzcrkmxModel from '../../../../model/WzcrkmxModel';
import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
...
...
@@ -92,7 +92,7 @@ struct WzinDetail {
TabContent() {
Column() {
WzInfo({ wzmx: this.wzmx, wzcrk: this.wzcrk, getDetail: this.getDetail })
WzInfo({ wzmx: this.wzmx, wzcrk: this.wzcrk, getDetail: this.getDetail
, pageType: "入库"
})
}.width("100%")
}.tabBar(this.TabBuilder(1, '物资信息'))
}
...
...
entry/src/main/ets/pages/metailmange/WzInvPage/WzInvDetail/WzInvDetail.ets
View file @
dde23e4a
...
...
@@ -2,7 +2,7 @@ import { TitleBar } from '../../../../view/title/TitleBar'
import router from '@ohos.router';
import { Logger } from '@ohos/common/src/main/ets/utils/Logger';
import { Wzcrk } from '@ohos/common/src/main/ets/entity/Wzcrk';
import { WzInfo } from '../../
WzInPage/WzinDetail
/WzInfo'
import { WzInfo } from '../../
Common
/WzInfo'
import { PzInvInfo } from './PzInvInfo'
import wzcrkmxModel from '../../../../model/WzcrkmxModel';
import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
...
...
entry/src/main/ets/pages/metailmange/WzOutPage/WzOutDetail/WzInfo.ets
deleted
100644 → 0
View file @
d510de8c
import router from '@ohos.router';
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 { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
import { WzList } from './WzList';
@Extend(Button) function CommonButtonStyle() {
.borderWidth(2)
.borderColor('#0fa983')
.backgroundColor('#97c6a6')
.fontColor('#fff')
.borderRadius(5)
.type(ButtonType.Normal)
.stateEffect(true)
}
@Component
// 物资信息
export struct WzInfo {
private searchcontroller: SearchController = new SearchController()
@State kfmc: string = ''
@State sfdw: string = ''
@State wzmx: WzmxClass[] = []
@ObjectLink wzcrk: WzClass
getDetail: (wzpm?:string) => void
aboutToAppear(){
this.getData()
}
async getData() {
const res = await kfModel.query({guid: this.wzcrk.kfguid})
this.kfmc = res[0].kfmc ?? ''
const res1 = await gldwModel.queryByData({dwdm:this.wzcrk.sfdw})
this.sfdw = res1[0].dwfh ?? ''
}
build() {
Column() {
Flex({ direction: FlexDirection.Column }) {
Column() {
Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
Row() {
Divider()
.vertical(true)
.height(14)
.strokeWidth(3)
.color('#19ac88')
.opacity(0.6)
.margin({ left: 8, right: 8 })
Text("单位/库房信息")
.fontWeight(FontWeight.Medium)
.fontSize(14)
.fontColor($r("app.color.item_color_black"))
}
.width("35%")
Text(this.sfdw + this.kfmc)
.fontWeight(FontWeight.Medium)
.fontSize(21)
.fontColor($r("app.color.title_background"))
.width("60%")
.textAlign(TextAlign.Start)
.padding({ bottom: 20, top: 20 })
}.width("100%")
}.padding({ bottom: 20, top: 20 })
.borderRadius(5)
.width("100%")
.backgroundColor("#fff")
Flex({ direction: FlexDirection.Column }) {
Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
Row() {
Divider()
.vertical(true)
.height(14)
.strokeWidth(3)
.color('#19ac88')
.opacity(0.6)
.margin({ left: 8, right: 8 })
Text("物资列表")
.fontWeight(FontWeight.Medium)
.fontSize(14)
.fontColor($r("app.color.item_color_black"))
}
}.padding({ left: 2, right: 10 })
.width("100%")
Row() {
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) => {
})
.margin({ left: 10 })
.borderRadius(5)
Button("查看状态").CommonButtonStyle().width("25%").margin({ left: 5, right: 5 }).onClick(() => {
router.pushUrl({ url: 'pages/metailmange/WzStatus', params: {
wzmx: this.wzmx
} })
})
}.width("100%")
}.padding({ top: 10, bottom: 10 }).width("100%")
Column() {
List() {
ForEach(this.wzmx, (item) => {
ListItem() {
WzList({ wzmx: item })
}
})
}
}.flexGrow(1)
}
.padding({ bottom: 20, top: 20 })
.borderRadius(15)
.margin({ top: 20 })
.width("100%")
.backgroundColor("#fff")
}
.width("100%")
.height("100%")
}
}
}
\ No newline at end of file
entry/src/main/ets/pages/metailmange/WzOutPage/WzOutDetail/WzList.ets
0 → 100644
View file @
dde23e4a
import { Logger } from '@ohos/common/src/main/ets/utils/Logger'
import { WzmxClass } from '../../Common/Wzcrk.data'
@Component
export struct WzList {
@ObjectLink wzmx: WzmxClass
build() {
Column() {
Flex({ justifyContent: FlexAlign.SpaceBetween }) {
Column() {
Text(this.wzmx.wzpm).padding({ top: 5, bottom: 5 }).alignSelf(ItemAlign.Start)
Row() {
Text("号型: " + this.wzmx.hxmc)
}.alignSelf(ItemAlign.Start).padding({ top: 5, bottom: 5 })
Row() {
Text('货位号')
Text( this.wzmx.hwh == '' ? '暂无货位号': this.wzmx.hwh)
}.alignSelf(ItemAlign.Start).padding({ top: 5, bottom: 5 })
}.margin({ left: 15 })
Column() {
Row() {
Text("总数: ")
Text(this.wzmx.pzsl + '')
}.alignSelf(ItemAlign.End).padding({ top: 5, bottom: 5 })
Row() {
Counter() {
Text(this.wzmx.crksl + '')
}
.width(120)
.onInc(() => {
this.wzmx.crksl = this.wzmx.crksl + 1
})
.onDec(() => {
if( this.wzmx.crksl == 0) {
return
}
this.wzmx.crksl = this.wzmx.crksl - 1
})
}.alignSelf(ItemAlign.End)
Row() {
Image($r('app.media.trash')).width(35)
}.alignSelf(ItemAlign.End)
}.margin({ right: 20 })
}.margin({ top: 10 }).border({ width: { bottom: '1lpx' }, color: "#717171" })
}
}
}
\ No newline at end of file
entry/src/main/ets/pages/metailmange/WzOutPage/WzOutDetail/WzOutDetail.ets
View file @
dde23e4a
...
...
@@ -2,7 +2,6 @@ import { TitleBar } from '../../../../view/title/TitleBar'
import router from '@ohos.router';
import { Logger } from '@ohos/common/src/main/ets/utils/Logger';
import { Wzcrk } from '@ohos/common/src/main/ets/entity/Wzcrk';
import { WzInfo } from './WzInfo'
import { PzInfo } from './PzInfo'
import wzcrkmxModel from '../../../../model/WzcrkmxModel';
import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
...
...
@@ -11,6 +10,7 @@ import wzcrkModel from '../../../../model/WzcrkModel';
import { SQLiteContext, Wzcrkmx, WzcrkmxDao } from '@ohos/common';
import {AddWzin} from './AddWzin'
import { uuid } from '@ohos/common/src/main/ets/utils/util';
import { WzInfo } from '../../Common/WzInfo';
@Extend(Button) function CommonButtonStyle() {
.borderWidth(2)
...
...
@@ -92,7 +92,7 @@ struct WzOutDetail {
TabContent() {
Column() {
WzInfo({ wzmx: this.wzmx, wzcrk: this.wzcrk, getDetail: this.getDetail })
WzInfo({ wzmx: this.wzmx, wzcrk: this.wzcrk, getDetail: this.getDetail
, pageType: "出库"
})
}.width("100%")
}.tabBar(this.TabBuilder(1, '物资信息'))
}
...
...
entry/src/main/ets/pages/metailmange/WzOutPage/WzOutPage.ets
View file @
dde23e4a
...
...
@@ -48,7 +48,7 @@ export struct WzOutPage {
router.pushUrl({url:'pages/order_detail/PzInOutDetailPage'})
}
aboutToAppear
() {
onPageShow
() {
this.getWzcrkList()
}
...
...
entry/src/main/resources/base/profile/main_pages.json
View file @
dde23e4a
...
...
@@ -48,6 +48,7 @@
"identify/demo_page/UHFDemo"
,
"identify/demo_page/ScanDemo"
,
"pages/metailmange/GoodsSelectHwPage"
,
"pages/metailmange/GoodsSelectRfidTools"
"pages/metailmange/GoodsSelectRfidTools"
,
"pages/metailmange/WzOutPage/WzOutDetail/WzOutDetail"
]
}
entry/src/main/resources/rawfile/scan/close.png
0 → 100644
View file @
dde23e4a
381 Bytes
entry/src/main/resources/rawfile/scan/eye.png
0 → 100644
View file @
dde23e4a
458 Bytes
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论