From 9b6cada0c407d36492f662a643a3a900819790fe Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 7 Feb 2025 14:44:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/as/standrecordapply/AppStandRecordApplyDetailsVo.java | 3 +++ .../api/wms/otheroutapply/AppOtheroutApplyDetailsVo.java | 3 +++ .../biz/as/standrecordapply/AppStandRecordApplyService.java | 1 + .../biz/wms/otheroutapply/AppOtherOutApplyService.java | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/standrecordapply/AppStandRecordApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/standrecordapply/AppStandRecordApplyDetailsVo.java index 13a19dd53e..71c72a256f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/standrecordapply/AppStandRecordApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/standrecordapply/AppStandRecordApplyDetailsVo.java @@ -56,6 +56,9 @@ public class AppStandRecordApplyDetailsVo implements Vo { private String sid; // sid + private String publishInfo; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("流程实例的sid") private String procInsId; @ApiModelProperty("taskId") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtheroutApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtheroutApplyDetailsVo.java index 65f1d360eb..b8914451d4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtheroutApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtheroutApplyDetailsVo.java @@ -54,6 +54,9 @@ public class AppOtheroutApplyDetailsVo implements Vo { private String sid; // sid + private String publishInfo; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门名称") private String deptName; @ApiModelProperty("制单人姓名") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/standrecordapply/AppStandRecordApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/standrecordapply/AppStandRecordApplyService.java index 1d54e587de..e745156ef4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/standrecordapply/AppStandRecordApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/standrecordapply/AppStandRecordApplyService.java @@ -64,6 +64,7 @@ public class AppStandRecordApplyService { AppStandRecordApplyDetailsVo appStandRecordApplyDetailsVo = new AppStandRecordApplyDetailsVo(); BeanUtil.copyProperties(data,appStandRecordApplyDetailsVo); appStandRecordApplyDetailsVo.setProcInsId(data.getProcInstId()); + appStandRecordApplyDetailsVo.setPublishInfo(data.getUseOrgName() + "-" + data.getDeptName()); List businessLicenseFile = data.getBusinessLicenseFile(); List agreementFile = data.getAgreementFile(); List otherFile = data.getOtherFile(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/otheroutapply/AppOtherOutApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/otheroutapply/AppOtherOutApplyService.java index a08c799fad..fe8ff06bbc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/otheroutapply/AppOtherOutApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/otheroutapply/AppOtherOutApplyService.java @@ -60,8 +60,9 @@ public class AppOtherOutApplyService { ResultBean rb = ResultBean.fireFail(); WmsOtheroutApplyDetailsVo data = wmsOtherOutApplyFeign.fetchDetailsBySid(sid).getData(); AppOtheroutApplyDetailsVo appOtheroutApplyDetailsVo = new AppOtheroutApplyDetailsVo(); - appOtheroutApplyDetailsVo.setProcInsId(data.getProcInstId()); BeanUtil.copyProperties(data,appOtheroutApplyDetailsVo); + appOtheroutApplyDetailsVo.setProcInsId(data.getProcInstId()); + appOtheroutApplyDetailsVo.setPublishInfo(data.getCreateOrgName() + "-" + data.getDeptName()); List otheroutDetailList = appOtheroutApplyDetailsVo.getOtheroutDetailList(); for (AppOtheroutDetailDetailsVo appOtheroutDetailDetailsVo : otheroutDetailList) { appOtheroutDetailDetailsVo.setWarehouseRackName(appOtheroutDetailDetailsVo.getWarehouseRackCode());