Browse Source

更改

master
ligaode 3 months ago
parent
commit
9b6cada0c4
  1. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/standrecordapply/AppStandRecordApplyDetailsVo.java
  2. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtheroutApplyDetailsVo.java
  3. 1
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/standrecordapply/AppStandRecordApplyService.java
  4. 3
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/otheroutapply/AppOtherOutApplyService.java

3
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")

3
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("制单人姓名")

1
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<AsStandRecordApplyUrl> businessLicenseFile = data.getBusinessLicenseFile();
List<AsStandRecordApplyUrl> agreementFile = data.getAgreementFile();
List<AsStandRecordApplyUrl> otherFile = data.getOtherFile();

3
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<AppOtheroutDetailDetailsVo> otheroutDetailList = appOtheroutApplyDetailsVo.getOtheroutDetailList();
for (AppOtheroutDetailDetailsVo appOtheroutDetailDetailsVo : otheroutDetailList) {
appOtheroutDetailDetailsVo.setWarehouseRackName(appOtheroutDetailDetailsVo.getWarehouseRackCode());

Loading…
Cancel
Save