From c81d454a4fa4e6508ddec589f09340b1e4f776de Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 14 May 2024 10:39:14 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PmFormDataController.java | 2 +- .../service/impl/PmFormDataServiceImpl.java | 2 +- .../wms/sync_manage/form_mapping/index.vue | 87 ++++++++++++++++++- 3 files changed, 87 insertions(+), 4 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java index 34fe4f0e..ba6daf7e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java @@ -38,7 +38,7 @@ public class PmFormDataController { public ResponseEntity queryAll(FormDataQuery query, PageQuery page) { // Page result = formDataService.page(page.build(), query.build()); // Object o = formDataService.queryAll(query,page); - return new ResponseEntity<>(formDataService.queryAll(query, page), HttpStatus.CREATED); + return new ResponseEntity<>(TableDataInfo.build(formDataService.page(page.build(),query.build())), HttpStatus.CREATED); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java index 0efcb0c3..53b123c7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java @@ -104,7 +104,7 @@ public class PmFormDataServiceImpl extends ServiceImpl1?(JSONArray)mapping_json.remove(0):mapping_json.getJSONArray(0); Map fieldMapping = mst_mapping_json.stream().collect(HashMap::new, (formMap, o) -> { JSONObject item = (JSONObject) o; formMap.put(item.getString("value"), item); diff --git a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue index 4c3aedb4..91725487 100644 --- a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue +++ b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue @@ -132,7 +132,7 @@ :close-on-click-modal="false" title="表单同步测试" :visible.sync=syncShow - width="600px" + width="800px" @close="syncAnalyseCannel" > @@ -140,9 +140,69 @@ - + +
+
+ 解析数据 +
+ + + + + + + + + + + + + + + + +
+
+ 明细数据 +
+ + + + + + + + + + + + + + + + +
+
同步解析
@@ -244,6 +304,11 @@ export default { syncShow: false, syncForm: {}, permission: {}, + viewMst: [], + viewDtl: [], + hasDtl: false, + viewMstCols: {}, + viewDtlCols: {}, rules: { position_code: [ { required: true, message: '缓存线位置编码不能为空', trigger: 'blur' } @@ -294,14 +359,32 @@ export default { syncTest(row){ this.syncShow = true this.syncForm = row + crudFormMapping.tableColumns(row.form_type).then(res => { + this.viewMstCols = res.item + if (res.dtl_item != null){ + this.hasDtl = true + this.viewDtlCols = res.dtl_item + } + }) }, syncAnalyseSubmit(){ + this.viewMst=[] + this.viewDtl = [] crudFormMapping.syncAnalyse(this.syncForm).then(res => { this.crud.notify('解析成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + for (let i = 0; i < res.content.length; i++) { + if (i==0){this.viewMst.push(res.content[i])} + else {this.viewDtl.push(res.content[i])} + } }) }, syncAnalyseCannel(){ this.syncForm = {} + this.viewMst = [], + this.viewDtl = [], + this.hasDtl = false, + this.viewMstCols = {}, + this.viewDtlCols = {} } } }