diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java index db5c3bc..8b4fc4a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java @@ -8,6 +8,8 @@ public class LocationDetail { private String quantity; + private String lotNo; + public String getLocationNo() { return locationNo; } @@ -31,4 +33,12 @@ public class LocationDetail { public void setQuantity(String quantity) { this.quantity = quantity; } + + public String getLotNo() { + return lotNo; + } + + public void setLotNo(String lotNo) { + this.lotNo = lotNo; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java index 6787e6e..181ef74 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java @@ -371,7 +371,7 @@ public class ToErpServiceImpl implements IToErpService { item.setSpecModel(detail.getSpec()); item.setUnit(detail.getUnit()); item.setQuantity(detail.getAssignNum()); - item.setLotNo(detail.getLotNo()); +// item.setLotNo(detail.getLotNo()); item.setLevelRelation(detail.getSpare1()); item.setUpperMaterial(detail.getSpare2()); item.setTopMaterial(detail.getSpare3()); @@ -385,6 +385,7 @@ public class ToErpServiceImpl implements IToErpService { locationDetail.setLocationNo(splitLocation[i]); locationDetail.setQuantity(splitQuantity[i]); locationDetail.setAreaNo(splitArea[i]); + locationDetail.setLotNo(detail.getLotNo()); locationDetails.add(locationDetail); } item.setLocations(locationDetails); @@ -467,7 +468,7 @@ public class ToErpServiceImpl implements IToErpService { item.setLevelRelation(detail.getSpare1()); item.setUpperMaterial(detail.getSpare2()); item.setTopMaterial(detail.getSpare3()); - item.setLotNo(detail.getLotNo()); +// item.setLotNo(detail.getLotNo()); item.setRemark(detail.getRemark()); // item.setArea(detail.getSpare9()); // item.setLocation(detail.getSpare8()); @@ -480,6 +481,7 @@ public class ToErpServiceImpl implements IToErpService { locationDetail.setLocationNo(splitLocation[i]); locationDetail.setQuantity(splitQuantity[i]); locationDetail.setAreaNo(splitArea[i]); + locationDetail.setLotNo(detail.getLotNo()); locationDetails.add(locationDetail); } item.setLocations(locationDetails);