diff --git a/src/main/java/com/gaotao/modules/mr/entity/dto/MaterialRequisitionIssueDto.java b/src/main/java/com/gaotao/modules/mr/entity/dto/MaterialRequisitionIssueDto.java index 86216d9..0c1a24e 100644 --- a/src/main/java/com/gaotao/modules/mr/entity/dto/MaterialRequisitionIssueDto.java +++ b/src/main/java/com/gaotao/modules/mr/entity/dto/MaterialRequisitionIssueDto.java @@ -11,7 +11,7 @@ public class MaterialRequisitionIssueDto { private String ifsOrderNo; private String ifsLineNo; private String ifsReleaseNo; - private int ifsLineItemNo; + private String ifsLineItemNo; private String ifsPartNo; private String ifsSiteID; private String ifsLocationNo; diff --git a/src/main/java/com/gaotao/modules/mr/entity/dto/MrIssueDto.java b/src/main/java/com/gaotao/modules/mr/entity/dto/MrIssueDto.java index 5ae1d57..6333400 100644 --- a/src/main/java/com/gaotao/modules/mr/entity/dto/MrIssueDto.java +++ b/src/main/java/com/gaotao/modules/mr/entity/dto/MrIssueDto.java @@ -23,6 +23,7 @@ public class MrIssueDto { private String remark; // 备注 private String warehouseId; // 仓库 + private String releaseNo; // 选择的材料行信息 private List selectedMaterials; diff --git a/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java b/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java index 0b2417b..32bc0c0 100644 --- a/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java +++ b/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java @@ -136,8 +136,8 @@ public class MrServiceImpl implements MrService { MaterialRequisitionIssueDto materialRequisitionIssueDto = new MaterialRequisitionIssueDto(); materialRequisitionIssueDto.setIfsOrderNo(transCommonRequestDto.getWorkOrderNo()); materialRequisitionIssueDto.setIfsLineNo(mrIssueDto.getLineNo()); - materialRequisitionIssueDto.setIfsReleaseNo("*"); - materialRequisitionIssueDto.setIfsLineItemNo(issue.getItemNo().intValue()); + materialRequisitionIssueDto.setIfsReleaseNo(mrIssueDto.getReleaseNo()); + materialRequisitionIssueDto.setIfsLineItemNo("1"); materialRequisitionIssueDto.setIfsPartNo(issue.getPartNo()); materialRequisitionIssueDto.setIfsSiteID(transCommonRequestDto.getSite()); materialRequisitionIssueDto.setIfsLocationNo(issue.getLocationId());