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
89ede70f
Commit
89ede70f
authored
Jan 22, 2024
by
huangqy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
单据上报
parent
8fb5c5a5
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
89 行增加
和
16 行删除
+89
-16
ViewdrdcDao.ets
common/src/main/ets/db/dao/ViewdrdcDao.ets
+3
-2
NativeSql.ets
common/src/main/ets/db/sql/NativeSql.ets
+1
-0
Viewdrdc.ts
common/src/main/ets/entity/Viewdrdc.ts
+3
-1
HttpUtil.ets
common/src/main/ets/utils/HttpUtil.ets
+2
-0
ViewdrdcModel.ets
entry/src/main/ets/model/ViewdrdcModel.ets
+5
-0
WzcrkModel.ets
entry/src/main/ets/model/WzcrkModel.ets
+10
-7
WzInPage.ets
entry/src/main/ets/pages/metailmange/WzInPage/WzInPage.ets
+53
-6
wzIn.api.ts
entry/src/main/ets/pages/metailmange/WzInPage/wzIn.api.ts
+9
-0
DataSynchronism.ets
entry/src/main/ets/pages/sub_systemMaintenance/DataSynchronism/DataSynchronism.ets
+3
-0
没有找到文件。
common/src/main/ets/db/dao/ViewdrdcDao.ets
View file @
89ede70f
...
...
@@ -31,7 +31,8 @@ export class ViewdrdcDao extends BaseTable<Viewdrdc> {
pmdmcode: cursor.getString(cursor.getColumnIndex('pmdmcode')),
pzsl: cursor.getLong(cursor.getColumnIndex('pzsl')),
crksl: cursor.getLong(cursor.getColumnIndex('crksl')),
wzdm: cursor.getString(cursor.getColumnIndex('wzdm'))
wzdm: cursor.getString(cursor.getColumnIndex('wzdm')),
wczt: cursor.getString(cursor.getColumnIndex('wczt')),
};
return info;
}
...
...
@@ -45,7 +46,7 @@ export class ViewdrdcDao extends BaseTable<Viewdrdc> {
}
getTableColumns(): string[] {
return ['guid', 'jhguid', 'gznd', 'sfdw', 'ydh', 'fwgldwdm', 'swgldwdm', 'fwgldwguid', 'swgldwguid', 'zmlx', 'dec', 'pzh', 'pzlx', 'ckdwguid', 'kfdm', 'jhmxguid', 'hwh', 'pmdmcode', 'pzsl', 'crksl', 'wzdm'];
return ['guid', 'jhguid', 'gznd', 'sfdw', 'ydh', 'fwgldwdm', 'swgldwdm', 'fwgldwguid', 'swgldwguid', 'zmlx', 'dec', 'pzh', 'pzlx', 'ckdwguid', 'kfdm', 'jhmxguid', 'hwh', 'pmdmcode', 'pzsl', 'crksl', 'wzdm'
,'wczt'
];
}
getCreateTableSql(): string {
...
...
common/src/main/ets/db/sql/NativeSql.ets
View file @
89ede70f
...
...
@@ -394,6 +394,7 @@ export class NativeSql {
crk.pzlx pzlx,
crk.ckdwguid ckdwguid,
crk.kfdm kfdm,
crk.wczt wczt,
mx.pzmxguid jhmxguid,
mx.hwh hwh,
mx.PMDMCODE pmdmcode,
...
...
common/src/main/ets/entity/Viewdrdc.ts
View file @
89ede70f
...
...
@@ -22,5 +22,6 @@ export interface Viewdrdc {
pmdmcode
:
string
,
pzsl
:
number
,
crksl
:
number
,
wzdm
:
string
wzdm
:
string
,
wczt
:
string
}
\ No newline at end of file
common/src/main/ets/utils/HttpUtil.ets
View file @
89ede70f
...
...
@@ -3,6 +3,7 @@ import type { AxiosInstance } from '@ohos/axios'
import type { AxiosRequestConfig } from '@ohos/axios'
import CommonConstant from '../constants/CommonConstants'
import promptAction from '@ohos.promptAction'
import { Logger } from './Logger'
class Request {
instance: AxiosInstance
...
...
@@ -27,6 +28,7 @@ class Request {
return res.data.data
},
(err) => {
Logger.info('err...........+' + err)
promptAction.showToast({
message: $r('app.string.http_response_error')
})
...
...
entry/src/main/ets/model/ViewdrdcModel.ets
View file @
89ede70f
...
...
@@ -11,6 +11,11 @@ class ViewdrdcModel {
return res;
}
async queryAll(): Promise<Viewdrdc[]> {
let res = await SQLiteContext.with(ViewdrdcDao).queryAll()
return res;
}
}
const drModel = new ViewdrdcModel()
...
...
entry/src/main/ets/model/WzcrkModel.ets
View file @
89ede70f
...
...
@@ -15,15 +15,15 @@ class WzcrkModel {
// 获取子单数量总和赋给主单
// @ts-ignore
const pzsl = data[index].jhmx.map(v =>
Number(v.pmsl)).reduce((a,b) => a+
b, 0)
const pzsl = data[index].jhmx.map(v =>
Number(v.pmsl)).reduce((a, b) => a +
b, 0)
// @ts-ignore
const crksl = data[index].jhmx.map(v =>
Number(v.crksl)).reduce((a,b) => a+
b, 0)
const crksl = data[index].jhmx.map(v =>
Number(v.crksl)).reduce((a, b) => a +
b, 0)
wzcrk.guid = uid
wzcrk.pzsl = pzsl
wzcrk.crksl = crksl
// @ts-ignore
const wzcrkmx = data[index].jhmx.map((v =>{
const wzcrkmx = data[index].jhmx.map((v =>
{
return {
...v,
guid: uuid(),
...
...
@@ -36,6 +36,7 @@ class WzcrkModel {
}
}));
Logger.info(this, '输出插入数据:'+ index + '_' + wzcrk.kfdm);
await SQLiteContext.with(WzcrkDao).insert(wzcrk)
await wzcrkmxModel.set(wzcrkmx)
}
...
...
@@ -43,7 +44,7 @@ class WzcrkModel {
}
// 查询
async query(data:Partial<Wzcrk>): Promise<Wzcrk[]> {
async query(data:
Partial<Wzcrk>): Promise<Wzcrk[]> {
let res = await SQLiteContext.with(WzcrkDao).getWzcrk(data)
return res;
}
...
...
@@ -55,18 +56,18 @@ class WzcrkModel {
/*获取物资出入库*/
async queryWzcrklist(sql?: string):Promise<Wzcrk[]> {
async queryWzcrklist(sql?: string):
Promise<Wzcrk[]> {
let res = await SQLiteContext.with(WzcrkDao).selectWzcrkList(sql);
return res;
}
async updateWzcrkWczt(guid: string, wczt: string):Promise<number> {
async updateWzcrkWczt(guid: string, wczt: string):
Promise<number> {
let res = await SQLiteContext.with(WzcrkDao).updateWczt(guid, wczt)
return res;
}
// 更新单据信息
async updateWcztByData(guid: string, data: Partial<Wzcrk>):Promise<number> {
async updateWcztByData(guid: string, data: Partial<Wzcrk>):
Promise<number> {
let res = await SQLiteContext.with(WzcrkDao).updateWcztByData(guid, data)
return res;
}
...
...
@@ -76,6 +77,7 @@ class WzcrkModel {
await SQLiteContext.with(WzcrkDao).clearTable()
}
}
const wzcrkModel = new WzcrkModel()
export default wzcrkModel
\ No newline at end of file
entry/src/main/ets/pages/metailmange/WzInPage/WzInPage.ets
View file @
89ede70f
...
...
@@ -9,6 +9,8 @@ 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';
@Extend(Button) function bottomBtnSty() {
.borderWidth(1)
...
...
@@ -161,13 +163,58 @@ export struct WzInPage {
}
onExportSubmit() {
this.checkedList.forEach(element => {
// let data = new ViewdrdcDao()
// ViewdrdcModel.queryExport()
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 newArr = [...new Set(jhguidArr)]
Logger.info('导出数据1:', JSON.stringify(newArr))
const exportData = newArr.map((item) => {
let newObj = {}
let ItemData = []
res.forEach((Item) => {
if (item == Item.guid) {
ItemData.push({
jhmxguid: Item.jhmxguid,
hwh: Item.hwh,
pmdmcode: Item.pmdmcode,
wzdm: Item.wzdm,
pzsl: Item.pzsl || 0,
sjsl: Item.crksl || 0
})
}
})
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,
scjid: "863576927543400,863576927543400",
cjmc: "普华",
imei: "863576927543400,863576927543400",
model: "ax6737_65_n",
vendor: "alps",
dcsj: "2024年01月20日",
pzmx: ItemData
}
}
return newObj
})
Logger.info('导出数据3:', JSON.stringify(exportData))
const kkkk = {
pzzbJson: exportData,
crklx: '11111CRKLX2',
gznd: '2023',
jsdwguid: 1,
}
await importData(kkkk)
}
})
Logger.info('--------覆盖合并-------:' + JSON.stringify(this.dataSource), JSON.stringify(this.checkedList))
promptAction.showToast({
message: '导出'
})
...
...
entry/src/main/ets/pages/metailmange/WzInPage/wzIn.api.ts
0 → 100644
View file @
89ede70f
import
defHttp
from
"@ohos/common/src/main/ets/utils/HttpUtil"
enum
Api
{
importData
=
'/api/integrate/knzy/importData'
}
// 导出出入库单据
export
const
importData
=
(
data
)
=>
defHttp
.
post
({
url
:
Api
.
importData
,
data
})
\ No newline at end of file
entry/src/main/ets/pages/sub_systemMaintenance/DataSynchronism/DataSynchronism.ets
View file @
89ede70f
...
...
@@ -159,6 +159,9 @@ export struct Pmhx {
// 在这里执行对每个元素的操作
return {
...row,
pzzbguid: row.jhguid,
ckdwguid: row.cbdwdm,
kfdm: row.ckkfdm,
sjlx: "导入",
wczt: "未完成",
};
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论