From 6fbcd3f76e5469120611e6bca390d419406f0968 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Sun, 1 Dec 2024 23:50:38 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8E=9F=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iostorage/sevice/PdaIOService.java | 7 ++- .../views/wms/stor_manage/out/TaskDialog.vue | 53 +++++++++---------- .../views/wms/stor_manage/out/ViewDialog.vue | 29 +++++----- 3 files changed, 46 insertions(+), 43 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java index 1d72794e..d1ff5872 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java @@ -3,6 +3,8 @@ package org.nl.wms.pda_manage.iostorage.sevice; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializeConfig; +import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.kingdee.bos.webapi.entity.IdentifyInfo; import com.kingdee.bos.webapi.sdk.K3CloudApi; @@ -139,8 +141,9 @@ public class PdaIOService { ivtDtl.setSource_form_id(dtl.getId()); ivtDtl.setSource_form_type(dtl.getForm_type()); 合并主表明细数据:{ - JSONObject sourceFormData = (JSONObject) JSONObject.toJSON(mstString); - JSONObject dtlJ = (JSONObject) JSONObject.toJSON(dtl); + JSONObject sourceFormData = JSONObject.parseObject(mstString); + String dtlStr = JSON.toJSONString(dtl); + JSONObject dtlJ = JSONObject.parseObject(dtlStr); dtlJ.putAll((Map) dtlJ.remove("form_data")); sourceFormData.putAll(dtlJ); ivtDtl.setSource_form_data(sourceFormData); diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue index e05db776..3c3555dd 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue @@ -26,8 +26,9 @@ - @@ -43,30 +44,30 @@ - + - + - + - +
出库明细 - + @@ -110,12 +111,13 @@ - - + + - - + + + @@ -144,12 +146,12 @@ - - + + - - - + + + @@ -160,13 +162,12 @@ import CRUD, { crud } from '@crud/crud' import crudProductout from '@/views/wms/stor_manage/out/storinvout' import formstruc from '@/views/wms/config_manage/formStruc/formstruc' - export default { name: 'TaskDialog', components: { }, mixins: [crud()], dicts: ['IO_BILL_STATUS', 'VEHICLE_OVER_TYPE', 'PCS_SAL_TYPE'], - statusEnums: [ 'IOBILL_TYPE_OUT','FORM_STATUS' ], + statusEnums: ['IOBILL_TYPE_OUT', 'FORM_STATUS'], props: { dialogShow: { type: Boolean, @@ -235,12 +236,12 @@ export default { this.tableData = res }) }, - handleCurrentDtl(row){ + handleCurrentDtl(row) { this.currentDtl = row - if (this.currentDtl.struct_code != null){ - this.divflag = false; - }else { - this.divflag = true; + if (this.currentDtl.struct_code != null) { + this.divflag = false + } else { + this.divflag = true } this.divdis(row) }, @@ -268,7 +269,7 @@ export default { }) this.tabledis = [] }, - divdis(row){ + divdis(row) { crudProductout.divDis(row).then(res => { this.tabledis = res.content }) @@ -293,7 +294,6 @@ export default { this.form.dtl_row = row this.form.storage_qty = this.form.dtl_row.plan_qty crudProductout.getVehicleTask({ 'iostorinv_id': row.iostorinv_id, 'iostorinvdtl_id': row.iostorinvdtl_id }).then(res => { - if (res.length !== 0) { this.form.tableMater = res } @@ -457,7 +457,6 @@ export default { } }, sectQueryChange(val) { - this.sectProp = val if (val.length === 1) { this.id = val[0] diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue index b9476658..93f98ca0 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue @@ -58,11 +58,11 @@ - + @@ -96,10 +96,11 @@ - + - - + + + @@ -128,16 +129,16 @@ - - + + - - + + @@ -153,7 +154,7 @@ export default { name: 'ViewDialog', components: { formstruc }, mixins: [crud()], - statusEnums: [ 'FORM_STATUS','IOBILL_TYPE_OUT' ], + statusEnums: ['FORM_STATUS', 'IOBILL_TYPE_OUT'], props: { dialogShow: { type: Boolean, @@ -165,8 +166,8 @@ export default { }, data() { return { - cols:[], - dtlCols:[], + cols: [], + dtlCols: [], dialogVisible: false, tableDtl: [], tabledis: [], @@ -217,7 +218,7 @@ export default { } }, queryTableDdis() { - if (this.currentdtl !== null && this.currentdtl.vehicle_code!=null) { + if (this.currentdtl !== null && this.currentdtl.vehicle_code != null) { crudProductIn.getVehicleTask({ 'vehicle_id': this.currentdtl.vehicle_id }).then(res => { this.tabledis = res }).catch(() => { @@ -237,7 +238,7 @@ export default { this.tableDtl = res }) }, - divdis(row){ + divdis(row) { crudProductIn.divDis(row).then(res => { this.tabledis = res.content })