Skip to content

J
jump_hm_warehouse
Commit d4968a9e by huangqy
Options

临时发物

parent e6080774
正在显示 包含 206 行增加 和 199 行删除
common/src/main/ets/bean/dto/WzcrkMxRefWzDto.ts
......@@ -22,7 +22,7 @@ export interface WzcrkMxRefWzDto {
export interface WzcrkDetailDto {
guid: string,
pzlx: string,
pzh: number,
pzh: string,
rkkfdm: string,
kfdm: string,
pzszlx: string,
......
common/src/main/ets/db/dao/WzcrkDao.ets
......@@ -25,7 +25,7 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
crklx: cursor.getString(cursor.getColumnIndex('crklx')),
pzzbguid: cursor.getString(cursor.getColumnIndex('pzzbguid')),
pzlx: cursor.getString(cursor.getColumnIndex('pzlx')),
pzh: cursor.getLong(cursor.getColumnIndex('pzh')),
pzh: cursor.getString(cursor.getColumnIndex('pzh')),
sjlx: cursor.getString(cursor.getColumnIndex('sjlx')),
pzszlx: cursor.getString(cursor.getColumnIndex('pzszlx')),
sfdw: cursor.getString(cursor.getColumnIndex('sfdw')),
......@@ -120,7 +120,7 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
let info: WzcrkDetailDto = {
guid: cursor.getString(cursor.getColumnIndex('guid')),
pzlx: cursor.getString(cursor.getColumnIndex('pzlx')),
pzh: cursor.getLong(cursor.getColumnIndex('pzh')),
pzh: cursor.getString(cursor.getColumnIndex('pzh')),
rkkfdm: cursor.getString(cursor.getColumnIndex('rkkfdm')),
kfdm: cursor.getString(cursor.getColumnIndex('kfdm')),
pzszlx: cursor.getString(cursor.getColumnIndex('pzszlx')),
......@@ -343,6 +343,7 @@ export class WzcrkDao extends BaseTable<Wzcrk> {
async insertPz(params) {
let val_sql = NativeSql.insertPzSql(params);
console.log("插入的字段是什么呢, 执行的sql是---", val_sql)
let db = await this.futureDb;
return await db.executeSql(val_sql)
}
......
common/src/main/ets/db/sql/NativeSql.ets
......@@ -150,7 +150,7 @@ WHERE
// 物资出入库表：
static insertPzSql(params): string {
const sql =
`insert into tab_bzgl_knzy_app_wzcrk (guid, gznd, crkrq, ckdwguid, czr, qrzt, crklx, pzzbguid, pzlx, pzh, sjlx, pzszlx, sfdw, wczt, kfdm, rkkfdm,ydh,dec,fwgldwdm,swgldwdm,kfguid,zmlx) values ('${(params.guid)}', '${(params.gznd)}', '${(params.time)}', '${(params.cbdwdm)}', '${(params.czr)}', '${(params.qrzt)}', '${(params.crklx)}', '${(params.jhguid)}', '${(params.pzlx)}', '${(params.pzh)}', '${(params.sjlx)}', '${(params.pzszlx)}', '${(params.sfdw)}','未完成','${(params.kfdm)}','${(params.rkkfdm)}','${(params.ydh)}','${(params.dec)}', '${(params.fwgldwdm)}', '${(params.swgldwdm)}', '${(params.kfguid)}', '${(params.zmlx)}')`;
`insert into tab_bzgl_knzy_app_wzcrk (guid, gznd, crkrq, ckdwguid, czr, qrzt, crklx, pzzbguid, pzlx, pzh, sjlx, pzszlx, sfdw, wczt, kfdm, rkkfdm,ydh,dec,fwgldwdm,swgldwdm,kfguid,zmlx) values ('${(params.guid)}', '${(params.gznd)}', '${(params.crkrq)}', '${(params.pzzbguid)}', '${(params.czr)}', '${(params.qrzt)}', '${(params.crklx)}', '${(params.jhguid)}', '${(params.pzlx)}', '${(params.pzh)}', '${(params.sjlx)}', '${(params.pzszlx)}', '${(params.sfdw)}','未完成','${(params.kfdm)}','${(params.rkkfdm)}','${(params.ydh)}','${(params.dec)}', '${(params.fwgldwdm)}', '${(params.swgldwdm)}', '${(params.kfguid)}', '${(params.zmlx)}')`;
return sql
}
......@@ -436,7 +436,7 @@ WHERE
"CRKLX" TEXT,
"PZZBGUID" TEXT,
"PZLX" TEXT,
"PZH" INTEGER,
"PZH" TEXT,
"SJLX" TEXT,
"PZSZLX" TEXT,
"SFDW" TEXT,
......
common/src/main/ets/utils/util.ts
......@@ -124,7 +124,7 @@ var dateUtils = {
} else if (type == 'after') {
return h + '时' + minute + '分' + second + '秒';
} else {
return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
return y + '-' + m + '-' + d;
}
},
formatDate(time) {
......
entry/src/main/ets/pages/metailmange/Common/Wzcrk.data.ets
......@@ -319,7 +319,7 @@ export class historicalInformationClass {
export class PzFormClass {
guid: string;
pzlx: string;
pzh: number;
pzh: string;
rkkfdm: string;
kfdm: string;
pzszlx: string;
......@@ -335,7 +335,7 @@ export class PzFormClass {
data: {
guid: string,
pzlx: string,
pzh: number,
pzh: string,
rkkfdm: string,
kfdm: string,
pzszlx: string,
......@@ -350,7 +350,7 @@ export class PzFormClass {
) {
this.guid = data.guid || '';
this.pzlx = data.pzlx || '';
this.pzh = data.pzh || 0;
this.pzh = data.pzh;
this.rkkfdm = data.rkkfdm || '';
this.kfdm = data.kfdm || '';
this.pzszlx = data.pzszlx || '';
......
entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzinsertDetail.ets → entry/src/main/ets/pages/metailmange/Common/WzinsertDetail.ets
import { TitleBar } from '../../../../view/title/TitleBar'
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 wzcrkmxModel from '../../../../model/WzcrkmxModel';
import { getDefaultPzh, historicalInformationClass, PzFormClass, WzClass } from '../../Common/Wzcrk.data';
import wzcrkmxModel from '../../../model/WzcrkmxModel';
import { getDefaultPzh, historicalInformationClass, PzFormClass, WzClass } from './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 wzcrkModel from '../../../model/WzcrkModel';
import { AddWzin } from '../WzInPage/WzinDetail/AddWzin'
import { dateUtils, uuid } from '@ohos/common/src/main/ets/utils/util';
import IdentifyService from '../../../identify/IdentifySerivce'
import emitter from '@ohos.events.emitter';
import { WzInsertInfo } from '../../Common/WzInsertInfo';
import { WzInsertInfo } from './WzInsertInfo';
import { zmlx_dict } from '@ohos/common/src/main/ets/utils/dict';
@Extend(Button) function CommonButtonStyle() {
......@@ -124,6 +124,181 @@ struct WzinsertDetail {
}
}
async submit() {
try {
Logger.info('保存的入库明细数据>>', JSON.stringify(this.historicalInformation))
if (!this.wzcrk.hwh) {
promptAction.showToast({
message: '请先扫描货位'
})
return
}
if (this.historicalInformation.length == 0) {
promptAction.showToast({
message: '请扫描物资'
})
return
}
const uuId = uuid()
this.uuId = uuId
// const params = {
// crkrq: new Date().toLocaleString(),
// guid: uuId,
// ...this.pzFrom
// }
// await createOrFindSQL("GY_M_PMV3", insertPz(params))
// if (this.pageType == '出库') {
// const newKcList = [...new Set(this.kcList)]
// newKcList.forEach(async (item) => {
// await createOrFindSQL("GY_M_PMV3", updateCkWzSql(item))
// })
// }
var newDataSource = []
this.historicalInformation.forEach(async (item) => {
item.guid = uuid()
item.wzcrkguid = this.uuId
if (this.pageType == '调号') {
if (item.currentModel) {
// 调出
item.pzsl = item.srsl
item.crksl = item.srsl
// item.crksl = 0 - Number(item.srsl)
} else {
// 调入
item.pzsl = 0 - Number(item.srsl)
item.crksl = 0 - Number(item.srsl)
// item.crksl = item.srsl
}
} else if (this.pageType == '换位') {
if (item.currentModel) {
// 换入
item.pzsl = 0 - Number(item.srsl)
item.crksl = 0 - Number(item.srsl)
// item.crksl = item.srsl
} else {
// 换出
item.pzsl = item.srsl
item.crksl = item.srsl
// item.crksl = 0 - Number(item.srsl)
}
} else {
item.pzsl = item.srsl
item.crksl = item.srsl
}
item.hwsl = item.srsl
if (this.pageType == '入库') {
newDataSource.push(item)
}
})
if (this.pageType == '调号') {
// currentModel
const fArr = this.historicalInformation.map((item) => Number(item.pzsl))
const sArr = this.historicalInformation.map((item) => Number(item.crksl))
const res1 = fArr.reduce((x, y) => x + y);
const res2 = sArr.reduce((x, y) => x + y);
if (res1 !== 0 || res2 !== 0) {
promptAction.showToast({
message: '调号总数不一致,不可提交'
})
return
} else {
const pmdmList = this.historicalInformation.map((pmdmItem) => pmdmItem
.pmdm)
const setPmdmList = [...new Set(pmdmList)]
const thzhjs = setPmdmList.map((setItem) => {
const pmdmJhList = this.historicalInformation.map((
pmdmItem) => {
if (pmdmItem.pmdm == setItem) {
return Number(pmdmItem.crksl)
} else {
return 0
}
})
const itemHj = pmdmJhList.reduce((x, y) => x + y);
return itemHj
})
var thzhjssl = true
thzhjs.forEach((thzhjsItem) => {
if (thzhjsItem != 0) {
thzhjssl = false
}
})
if (thzhjssl) {
this.historicalInformation.forEach(async (item) => {
await wzcrkmxModel.insertWzBing(item)
// await createOrFindSQL("GY_M_PMV3", insertWz(item))
})
} else {
promptAction.showToast({
message: '同品种调号数量不一致,不可提交'
})
return
}
}
} else if (this.pageType == '换位') {
const fArr = this.historicalInformation.map((item) => Number(item.pzsl))
const sArr = this.historicalInformation.map((item) => Number(item.crksl))
const res1 = fArr.reduce((x, y) => x + y);
const res2 = sArr.reduce((x, y) => x + y);
if (res1 !== 0 || res2 !== 0) {
promptAction.showToast({
message: '总数不一致,不可提交'
})
return
} else {
const pmdmcodeData = this.historicalInformation.map((item) => item
.pmdmcode)
const newPmdmcodeData = [...new Set(pmdmcodeData)]
const testHw = newPmdmcodeData.map((item) => {
const npdList = this.historicalInformation.filter(ele => ele
.pmdmcode == item)
const hwTjArr = npdList.map((item) => Number(item.crksl))
const hwTj = hwTjArr.reduce((x, y) => x + y);
console.log('hwTj', hwTj)
if (hwTj == 0) {
return true
} else {
return false
}
})
console.log('testHw', testHw)
const isTestHw = testHw.every(item => item)
console.log('isTestHw', isTestHw)
if (isTestHw) {
this.historicalInformation.forEach(async (item) => {
await wzcrkmxModel.insertWzBing(item)
// await createOrFindSQL("GY_M_PMV3", insertWz(item))
})
} else {
promptAction.showToast({
message: '同品种号型换位数量不一致,不可提交'
})
return
}
}
} else {
this.historicalInformation.forEach(async (item) => {
await wzcrkmxModel.insertWzBing(item)
// await createOrFindSQL("GY_M_PMV3", insertWz(item))
})
}
if (this.pageType == '入库') {
this.setData(newDataSource)
} else {
this.overFun()
}
} catch (e) {
promptAction.showToast({
message: '保存入库数据失败',
bottom: 200
})
}
}
setData(data) {
this.looperFun(data, 0)
}
......@@ -168,11 +343,13 @@ struct WzinsertDetail {
// const uuId = uuid()
const params = {
crkrq: new Date().toLocaleString(),
...this.wzcrk,
gznd: new Date().getFullYear() + '',
crkrq: dateUtils.formatDateTime(new Date(), ''),
guid: this.uuId,
sjlx: this.currentSjlx || '新建',
...this.wzcrk
sjlx: this.currentSjlx || '新建'
}
console.log("-------------插入的字段是什么呢--", JSON.stringify(params))
await wzcrkModel.insertPz(params)
// await createOrFindSQL("GY_M_PMV3", insertPz(params))
const zsParams = {
......@@ -255,179 +432,8 @@ struct WzinsertDetail {
})
Button("保存").CommonButtonStyle().width("50%")
.onClick(async () => {
try {
Logger.info('保存的入库明细数据>>', JSON.stringify(this.historicalInformation))
if (!this.wzcrk.hwh) {
promptAction.showToast({
message: '请先扫描货位'
})
return
}
if (this.historicalInformation.length == 0) {
promptAction.showToast({
message: '请扫描物资'
})
return
}
const uuId = uuid()
this.uuId = uuId
// const params = {
// crkrq: new Date().toLocaleString(),
// guid: uuId,
// ...this.pzFrom
// }
// await createOrFindSQL("GY_M_PMV3", insertPz(params))
// if (this.pageType == '出库') {
// const newKcList = [...new Set(this.kcList)]
// newKcList.forEach(async (item) => {
// await createOrFindSQL("GY_M_PMV3", updateCkWzSql(item))
// })
// }
var newDataSource = []
this.historicalInformation.forEach(async (item) => {
item.guid = uuid()
item.wzcrkguid = this.uuId
if (this.pageType == '调号') {
if (item.currentModel) {
// 调出
item.pzsl = item.srsl
item.crksl = item.srsl
// item.crksl = 0 - Number(item.srsl)
} else {
// 调入
item.pzsl = 0 - Number(item.srsl)
item.crksl = 0 - Number(item.srsl)
// item.crksl = item.srsl
}
} else if (this.pageType == '换位') {
if (item.currentModel) {
// 换入
item.pzsl = 0 - Number(item.srsl)
item.crksl = 0 - Number(item.srsl)
// item.crksl = item.srsl
} else {
// 换出
item.pzsl = item.srsl
item.crksl = item.srsl
// item.crksl = 0 - Number(item.srsl)
}
} else {
item.pzsl = item.srsl
item.crksl = item.srsl
}
item.hwsl = item.srsl
if (this.pageType == '入库') {
newDataSource.push(item)
}
})
if (this.pageType == '调号') {
// currentModel
const fArr = this.historicalInformation.map((item) => Number(item.pzsl))
const sArr = this.historicalInformation.map((item) => Number(item.crksl))
const res1 = fArr.reduce((x, y) => x + y);
const res2 = sArr.reduce((x, y) => x + y);
if (res1 !== 0 || res2 !== 0) {
promptAction.showToast({
message: '调号总数不一致,不可提交'
})
return
} else {
const pmdmList = this.historicalInformation.map((pmdmItem) => pmdmItem
.pmdm)
const setPmdmList = [...new Set(pmdmList)]
const thzhjs = setPmdmList.map((setItem) => {
const pmdmJhList = this.historicalInformation.map((
pmdmItem) => {
if (pmdmItem.pmdm == setItem) {
return Number(pmdmItem.crksl)
} else {
return 0
}
})
const itemHj = pmdmJhList.reduce((x, y) => x + y);
return itemHj
})
var thzhjssl = true
thzhjs.forEach((thzhjsItem) => {
if (thzhjsItem != 0) {
thzhjssl = false
}
})
if (thzhjssl) {
this.historicalInformation.forEach(async (item) => {
await wzcrkmxModel.insertWzBing(item)
// await createOrFindSQL("GY_M_PMV3", insertWz(item))
})
} else {
promptAction.showToast({
message: '同品种调号数量不一致,不可提交'
})
return
}
}
} else if (this.pageType == '换位') {
const fArr = this.historicalInformation.map((item) => Number(item.pzsl))
const sArr = this.historicalInformation.map((item) => Number(item.crksl))
const res1 = fArr.reduce((x, y) => x + y);
const res2 = sArr.reduce((x, y) => x + y);
if (res1 !== 0 || res2 !== 0) {
promptAction.showToast({
message: '总数不一致,不可提交'
})
return
} else {
const pmdmcodeData = this.historicalInformation.map((item) => item
.pmdmcode)
const newPmdmcodeData = [...new Set(pmdmcodeData)]
const testHw = newPmdmcodeData.map((item) => {
const npdList = this.historicalInformation.filter(ele => ele
.pmdmcode == item)
const hwTjArr = npdList.map((item) => Number(item.crksl))
const hwTj = hwTjArr.reduce((x, y) => x + y);
console.log('hwTj', hwTj)
if (hwTj == 0) {
return true
} else {
return false
}
})
console.log('testHw', testHw)
const isTestHw = testHw.every(item => item)
console.log('isTestHw', isTestHw)
if (isTestHw) {
this.historicalInformation.forEach(async (item) => {
await wzcrkmxModel.insertWzBing(item)
// await createOrFindSQL("GY_M_PMV3", insertWz(item))
})
} else {
promptAction.showToast({
message: '同品种号型换位数量不一致,不可提交'
})
return
}
}
} else {
this.historicalInformation.forEach(async (item) => {
await wzcrkmxModel.insertWzBing(item)
// await createOrFindSQL("GY_M_PMV3", insertWz(item))
})
}
if (this.pageType == '入库') {
this.setData(newDataSource)
} else {
this.overFun()
}
} catch (e) {
promptAction.showToast({
message: '保存入库数据失败',
bottom: 200
})
}
.onClick(() => {
this.submit()
})
}
}.margin({ left: 10, right: 10 }).height(80)
......
entry/src/main/ets/pages/metailmange/WzConversionPage/WzConversionPage.ets
......@@ -48,7 +48,7 @@ struct WzConversionPage{
this.dataSource = []
const res = await wzcrkModel.query({
pzlx: "HW44",
pzh: Number(this.searchData.pzh),
pzh: this.searchData.pzh,
wczt: this.searchData.wczt,
sjlx: this.currentIndex === 0 ? "导入" : "临时调号" })
res.forEach(element => {
......
entry/src/main/ets/pages/metailmange/WzInPage/WzInPage.ets
......@@ -74,7 +74,7 @@ export struct WzInPage {
async getWzcrkList(qzh?: number, wczt?: string) {
Logger.info('出入库传入参数>>:', JSON.stringify(this.searchData))
this.dataSource = []
const res = await wzcrkModel.query({ pzlx: "14", 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 => {
......
entry/src/main/ets/pages/metailmange/WzInvPage/WzInvPage.ets
......@@ -61,7 +61,7 @@ struct WzInvPage{
this.dataSource = []
const res = await wzcrkModel.query({
pzlx: "42",
pzh: Number(this.searchData.pzh),
pzh: this.searchData.pzh,
wczt: this.currentIndex === 0 ? "未完成" : "已完成" })
res.forEach(element => {
this.dataSource.push(new WzClass(element))
......
entry/src/main/ets/pages/metailmange/WzOutPage/WzOutPage.ets
......@@ -56,7 +56,7 @@ export struct WzOutPage {
this.dataSource = []
const res = await wzcrkModel.query({
pzlx: "17",
pzh: Number(this.searchData.pzh),
pzh: this.searchData.pzh,
wczt: this.searchData.wczt,
sjlx: this.currentIndex === 0 ? "导入" : "临时发物" })
res.forEach(element => {
......
entry/src/main/ets/pages/metailmange/WzReversePage/WzReversePage.ets
......@@ -54,7 +54,7 @@ struct WzReversePage{
this.dataSource = []
const res = await wzcrkModel.query({
pzlx: "19",
pzh: Number(this.searchData.pzh),
pzh: this.searchData.pzh,
wczt: this.currentIndex === 0 ? "未完成" : "已完成" })
res.forEach(element => {
this.dataSource.push(new WzClass(element))
......
entry/src/main/resources/base/profile/main_pages.json
......@@ -57,6 +57,6 @@
"pages/metailmange/GoodsSelectRfidTools",
"pages/metailmange/WzOutPage/WzOutDetail/WzOutDetail",
"pages/package/ReceivePack",
"pages/metailmange/WzInPage/WzinDetail/WzinsertDetail"
"pages/metailmange/Common/WzinsertDetail"
]
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论