Skip to content

J
jump_hm_warehouse
Commit e7a58017 by 毛勇泽
Options

Merge remote-tracking branch 'origin/master'

parents b48fcf59 84ec63f4
正在显示 包含 387 行增加 和 30 行删除
common/src/main/ets/db/dao/WzcrkmxDao.ets
......@@ -405,7 +405,7 @@ export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
try {
let val_sql = NativeSql.insertWzSql(params)
let db = await this.futureDb;
let rs = await db.querySql(val_sql);
let rs = await db.executeSql(val_sql);
return rs;
} catch (e) {
throw new Error('[插入异常]|' + e)
......
common/src/main/ets/dbflow/Migration.ets 0 → 100644
import rdb from '@ohos.data.relationalStore'
import { Logger } from '../utils/Logger'
/**
* 数据迁移类
*/
export class Migration {
/**
* 数据库名称
*/
private dbName: string = "";
/**
* 数据库表名
*/
private tableName: string = "";
/**
* 数据库版本（默认：1）
*/
private dbVersion: number = 1;
/**
* 对表进行修改的Alter语句(ALTER TABLE 语句用于在已有的表中添加、修改或删除列)
*/
private alters: string = "";
/**
* @param dbName 数据库名称
* @param tableName 表名称
* @param dbVersion 数据库版本
*/
constructor(dbName: string, tableName: string, dbVersion: number) {
this.tableName = tableName;
this.dbName = dbName;
this.dbVersion = dbVersion;
}
/**
* 新增列操作
*/
addColumn(columnName: string, columnType: string): any {
if (this.alters == "") {
this.alters = "alter table " + this.tableName + " add " + columnName + " " + columnType;
}
return this;
}
/**
* 修改列操作(需要修改的列名以及列数据类型名称,返回当前类实例)
*/
updateColumn(columnName: string, columnType: string): any {
if (this.alters == "") {
this.alters = "alter table " + this.tableName + " alter column " + columnName + " " + columnType;
}
return this;
}
/**
* 删除列操作(需要删除的列名,返回当前类实例)
*/
deleteColumn(columnName: string): any {
if (this.alters == "") {
this.alters = "alter table " + this.tableName + " drop column " + columnName;
}
return this;
}
/**
* 列操作
*/
Alter(alters: string): any {
if (this.alters != "") {
this.alters = ""
}
this.alters = alters;
return this;
}
/**
* 执行操作并升级数据库
* @param context
* @param encrypt
*/
public execute(context: any, encrypt: boolean): any {
let that = this;
rdb.getRdbStore(context, {
name: that.dbName,
securityLevel: rdb.SecurityLevel.S1,
encrypt: encrypt
}, (err, rdbStore) => {
if (err) {
Logger.info(this, '[数据迁移失败]|错误信息:' + err)
} else {
rdbStore.executeSql(that.alters, null, () => {
Logger.info(this, '数据迁移完成')
})
}
})
return this;
}
/**
* 异步执行操作并升级数据库
* @param context
* @param encrypt
*/
public async executeAsync(context: any, encrypt: boolean): Promise<any> {
let rdbStore: rdb.RdbStore = await rdb.getRdbStore(context, {
name: this.dbName,
securityLevel: rdb.SecurityLevel.S1,
encrypt: encrypt
})
await rdbStore.executeSql(this.alters, null);
Logger.info(this, '数据迁移完成')
return this;
}
}
\ No newline at end of file
entry/src/main/ets/pages/metailmange/Common/WzInfo.ets
......@@ -3,7 +3,7 @@ import { Logger } from '@ohos/common';
import gldwModel from '../../../model/GldwModel';
import kfModel from '../../../model/KfModel';
import { DividerTitle } from '../../../view/DividerTitle/DividerTitle';
import { historicalInformationClass, PzFormClass, ScanWzClass, WzClass, WzmxClass } from './Wzcrk.data';
import { historicalInformationClass, PzFormClass, ScanWzClass, WzClass } from './Wzcrk.data';
import { WzList } from '../WzInPage/WzinDetail/WzList';
import { WzScanInfoDialog } from './Dialog/WzScanInfoDialog';
import { analysisQrCode } from '../../../identify/analysis/analysis_QR_code'
......@@ -11,8 +11,6 @@ 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 { PzMxDto } from '@ohos/common/src/main/ets/bean/dto/RecommendHwDto.ts';
import wzcrkModel from '../../../model/WzcrkModel';
@Extend(Button) function CommonButtonStyle() {
......@@ -167,9 +165,9 @@ export struct WzInfo {
this.isAutomation = false
const res = await analysisQrCode(value, false)
if (res.data && res.data.length > 0) {
if (this.scanInfoDialog != undefined) {
this.scanInfoDialog.open()
}
// if (this.scanInfoDialog != undefined) {
// this.scanInfoDialog.open()
// }
console.log("解析货位", JSON.stringify(res.data))
//1. 获取默认货位
this.handleGetDefaultHwh(res)
......@@ -292,7 +290,6 @@ export struct WzInfo {
console.log('pzData', JSON.stringify(pzData))
if (pzData.length == 0) {
Prompt.showToast({
// title: this.pageType + '导入的凭证中无扫描品种,不容许添加!',
message: '本单据中无此扫描品种，不允许添加！'
})
return
......@@ -336,7 +333,7 @@ export struct WzInfo {
wzcrkguid: this.pzxqGuild,
pmdmcode: ITEM.pmdmcode
}
const pzData = await await wzcrkmxModel.getPzMxItem(params, false)
const pzData = await wzcrkmxModel.getPzMxItem(params, false)
console.log('pzDatapzData', pzData)
if (pzData.length == 0) {
Prompt.showToast({
......@@ -521,18 +518,23 @@ export struct WzInfo {
currentModel: this.currentModel,
...filterInsrtData
}
console.log("11.调试======", JSON.stringify(insertParams))
await wzcrkmxModel.insertWz(insertParams)
// createOrFindSQL("GY_M_PMV3", insertWz(insertParams))
ITEM.mxguid = insertParams.guid
}
// this.pageInit(ITEM, 'update')
Logger.info(this, "调试======")
if (res.data && res.data.length > 1) {
Logger.info(this, "调试======1")
this.pageInit(ITEM, 'update')
} else {
if (this.pageType == '倒库' || this.pageType == '调号' || this.pageType == '换位') {
this.pageInit(ITEM, 'update')
} else {
Logger.info(this, "调试======2")
this.setDkScan(ITEM, res.data)
}
}
......@@ -944,6 +946,7 @@ export struct WzInfo {
// console.log('新增物资明细结束', dateUtils.formatDate(new Date()))
// this.insertWzMxFun(params)
this.historicalInformation.unshift(params)
console.log("==========================", JSON.stringify(this.historicalInformation))
// this.historicalInformation.forEach((item) => {
// if (item.pmdmcode == params.pmdmcode) {
// console.log('筛选ITEM', item)
......
entry/src/main/ets/pages/metailmange/Common/Wzcrk.data.ets
......@@ -262,6 +262,8 @@ export class historicalInformationClass {
mxguid: string
pzmxguid: string
currentModel?: boolean
srsl?: number
hwsl?: number
constructor(data: {
......@@ -275,6 +277,8 @@ export class historicalInformationClass {
mxguid: string
pzmxguid: string
currentModel?: boolean
srsl?: number
hwsl?: number
}) {
this.wzpm = data.wzpm
this.pmdmsix = data.pmdmsix
......@@ -286,6 +290,8 @@ export class historicalInformationClass {
this.mxguid = data.mxguid
this.pzmxguid = data.pzmxguid
this.currentModel = data.currentModel || false
this.srsl = data.srsl
this.hwsl = data.hwsl
}
}
......
entry/src/main/ets/pages/metailmange/WzInPage/WzInPage.ets
......@@ -251,8 +251,8 @@ export struct WzInPage {
// 获取凭证号
const pzh = await getDefaultPzh('14')
router.pushUrl({
url: "pages/metailmange/WzInPage/WzinDetail/WzinDetail",
params: { isUpdate: false, wzcrk: { pzlx: '14', pzszlx: "DR", pzh,crklx: '2', wczt:"未完成" } }
url: "pages/metailmange/WzInPage/WzinDetail/WzinsertDetail",
params: { currentSjlx: '临时收物', wzcrk: { pzlx: '14', pzszlx: "DR", pzh,crklx: '2', wczt:"未完成" } }
})
})
.fontColor("#0fa983")
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/AddWzin.ets
......@@ -52,20 +52,20 @@ export struct AddWzin {
{ title: "收支类型", key: 'pzszlx', enabled: false, type: 'input' },
{
title: "库房",
key: 'kfguid',
enabled: true,
type: 'select',
options: [],
required: true
},
{
title: "货位号",
key: 'hwh',
key: 'kfdm',
enabled: true,
type: 'select',
options: [],
required: true
},
// {
// title: "货位号",
// key: 'hwh',
// enabled: true,
// type: 'select',
// options: [],
// required: true
// },
{
title: "发物管理单位",
key: 'fwgldwdm',
......@@ -131,7 +131,7 @@ export struct AddWzin {
const kfList = await kfModel.query({})
// 获取货架列表
const hwList = await hwModel.query()
// const hwList = await hwModel.query()
// 获取单位列表
const dwList = await gldwModel.queryByData({})
......@@ -140,17 +140,18 @@ export struct AddWzin {
this.form.push(new Form(i))
})
kfList.forEach(i => {
this.form[this.form.findIndex(v => v.key == 'kfguid')]
this.form[this.form.findIndex(v => v.key == 'kfdm')]
.options
.push(new Options(i.kfmc, i.guid))
.push(new Options(i.kfmc, i.kfdm))
})
hwList.forEach(i => {
this.form[this.form.findIndex(v => v.key == 'hwh')]
.options
.push(new Options(i.hwh, i.hwh))
})
// hwList.forEach(i => {
// this.form[this.form.findIndex(v => v.key == 'hwh')]
// .options
// .push(new Options(i.hwh, i.hwh))
// })
zmlx_dict.forEach(i => {
......@@ -212,6 +213,7 @@ export struct AddWzin {
.borderColor($r("app.color.rank_secondary_border"))
.onSelect((index: number, value?: string) => {
this.wzcrk[item.key] = item.options[index].id
console.log('>>>>>>>>>选择了+', JSON.stringify(this.wzcrk))
})
}
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzList.ets
......@@ -22,7 +22,7 @@ export struct WzList {
Column() {
Row() {
Text("总数: ")
Text(this.wzmx.pzsl + '')
Text(this.wzmx.pzsl ? this.wzmx.pzsl + '' : this.wzmx.crksl + '')
}.alignSelf(ItemAlign.End).padding({ top: 5, bottom: 5 })
Row() {
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzinsertDetail.ets 0 → 100644
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 '../../Common/WzInfo'
import { PzInfo } from './PzInfo'
import wzcrkmxModel from '../../../../model/WzcrkmxModel';
import { historicalInformationClass, PzFormClass, WzClass, WzmxClass } from '../../Common/Wzcrk.data';
import promptAction from '@ohos.promptAction';
import wzcrkModel from '../../../../model/WzcrkModel';
import { AddWzin } from './AddWzin'
import { uuid } from '@ohos/common/src/main/ets/utils/util';
import IdentifyService from '../../../../identify/IdentifySerivce'
import emitter from '@ohos.events.emitter';
import { WzcrkDetailDto } from '@ohos/common/src/main/ets/bean/dto/WzcrkMxRefWzDto';
import { WzInsertInfo } from '../../Common/WzInsertInfo';
@Extend(Button) function CommonButtonStyle() {
.borderWidth(2)
.borderColor('#0fa983')
.backgroundColor('#97c6a6')
.fontColor('#fff')
.borderRadius(5)
.type(ButtonType.Normal)
.stateEffect(true)
}
interface params {
wzcrk: Wzcrk,
currentSjlx: string
}
@Entry
@Component
struct WzinsertDetail {
@State fontColor: string = '#0FA983'
@State selectedFontColor: string = '#fff'
@State currentIndex: number = 0
@State currentSjlx: string = '临时收物'
@State wzcrk: WzClass = null // 物资出入库单据信息
@State historicalInformation: historicalInformationClass[] = [] // 物资出入库明细
@State pzForm: PzFormClass = null // 物资出入库表单详情
private controller: TabsController = new TabsController()
onPageShow() {
const params = router.getParams() as params
this.currentSjlx = params.currentSjlx
this.wzcrk = new WzClass(params.wzcrk)
// if (this.isUpdate) {
// this.getWzFormDetail()
// }
// this.getWzmxList()
this.scanCodeListen()
IdentifyService.openScanPort()
}
// 获取物资表单详情
async getWzFormDetail() {
Logger.info('获取物资表单详情>>', JSON.stringify(this.wzcrk.guid))
const res = await wzcrkModel.queryByCrkDetailGuid(this.wzcrk.guid)
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))
}
@Builder TabBuilder(index: number, name: string) {
Column() {
Text(name)
.fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
.fontSize(21)
.lineHeight(36)
}
.width('100%')
.height(45)
.border({ width: 2, color: 'rgb(15, 169, 131)' })
.borderRadius(3)
.backgroundColor(this.currentIndex === index ? this.fontColor : '#00000000')
}
build() {
Column() {
Flex({ direction: FlexDirection.Column }) {
TitleBar({ title: "物资新增" })
Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
TabContent() {
Column() {
AddWzin({ wzcrk: this.wzcrk })
}.width("100%")
}.tabBar(this.TabBuilder(0, '凭证信息'))
TabContent() {
Column() {
// pzxqGuild必传 是wzcrk的guid, 我里面已经接了
// pageType必传 入库 出库 盘库 调号 倒库 换位
// dataType必传 导入是true, 其他为false
// isHaveButton 必传 完成状态 未完成是true, 其他为false
WzInsertInfo({
wzcrk: this.wzcrk as PzFormClass,
getDetail: this.getWzmxList,
pageType: "入库",
historicalInformation: this.historicalInformation,
isHaveButton: this.wzcrk.wczt == '未完成' ? true : false
})
}.width("100%")
}.tabBar(this.TabBuilder(1, '物资信息'))
}
.margin({ left: 15, right: 15, top: 15 })
.onChange((index: number) => {
this.currentIndex = index
})
Row() {
Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
Button("射频扫码").CommonButtonStyle().width("50%").onClick(() => {
router.pushUrl({ url: 'pages/metailmange/UHFScanPage', params: { wzcrkItem: this.wzcrk } })
})
Button("保存").CommonButtonStyle().width("50%")
.onClick(async () => {
try {
Logger.info('保存的入库明细数据>>', JSON.stringify(this.historicalInformation))
// if (this.isUpdate) {
// const crksl = this.historicalInformation.map(v => Number(v.crksl)).reduce((a, b) => a + b, 0)
// await wzcrkModel.updateWcztByData(this.wzcrk.guid, {
// dec: this.wzcrk.dec,
// ydh: this.wzcrk.ydh,
// crksl
// })
//
// for (let index = 0; index < this.historicalInformation.length; index++) {
// const element = this.historicalInformation[index];
// try {
// let val1 = await wzcrkmxModel.updateWcztmxByData(element.mxguid, { crksl: element.crksl })
// } catch (e) {
// Logger.error(this, '保存失败了>>' + JSON.stringify(e))
// }
// }
// }
// else {
const uid = uuid()
this.wzcrk.guid = uid
this.wzcrk.gznd = new Date().getFullYear() + ''
this.wzcrk.sjlx = '新建'
await wzcrkModel.setOne(this.wzcrk)
Logger.info('添加的入库数据>>', JSON.stringify(this.wzcrk))
const data = this.historicalInformation.map((v => {
return {
guid: uuid(),
gznd: new Date().getFullYear() + '',
pmdmcode: v.pmdmcode,
pzsl: v.pzsl,
crksl: v.crksl,
wzcrkguid: uid,
hwh: v.hwh,
pzmxguid: v.pzmxguid
}
}))
await wzcrkmxModel.set(data)
// }
promptAction.showToast({
message: '保存入库数据成功',
bottom: 300
})
// setTimeout(() => {
// router.back({ url: 'pages/metailmange/WzInPage/WzInPage' })
// }, 300)
} catch (e) {
promptAction.showToast({
message: '保存入库数据失败',
bottom: 200
})
}
})
}
}.margin({ left: 10, right: 10 }).height(80)
}.width("100%")
}.onKeyEvent((e: globalThis.KeyEvent) => {
console.error('keycode====》:' + e.keyCode)
if ((e.keyCode == 2096 || e.keyCode == 2093)) {
if (e.type == 1) {
if (this.currentIndex == 0) {
this.currentIndex = 1
}
IdentifyService.openScan()
}
}
console.error('keycode====》:' + e.keyCode)
}).linearGradient({
direction: GradientDirection.Right, // 渐变方向
repeating: true, // 渐变颜色是否重复
colors: [[0x36a3c0, 0.0], [0x97c6a6, 1], [0xc7d799, 0.0]] // 数组末尾元素占比小于1时满足重复着色效果
})
}
scanCodeListen() {
var innerEvent = { eventId: 2 }
emitter.on(innerEvent, (eventData) => {
if (innerEvent.eventId == 2) {
let result = eventData.data.scancode
console.log("扫码校验", "收到扫码信息:" + result)
let innerEvent = {
eventId: 3,
};
var eventQRData = {
data: {
'qrcode': result
},
priority: emitter.EventPriority.IMMEDIATE
}
emitter.emit(innerEvent, eventQRData)
}
})
}
}
\ No newline at end of file
entry/src/main/resources/base/profile/main_pages.json
......@@ -53,6 +53,7 @@
"pages/metailmange/GoodsSelectHwPage",
"pages/metailmange/GoodsSelectRfidTools",
"pages/metailmange/WzOutPage/WzOutDetail/WzOutDetail",
"pages/package/ReceivePack"
"pages/package/ReceivePack",
"pages/metailmange/WzInPage/WzinDetail/WzinsertDetail"
]
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论