zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库部分和接口

Browse Source
This commit is contained in:
张怡蓉
2026-03-02 11:41:34 +08:00
parent a33998553e
commit 83db499c85
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java
View File

@@ -8,6 +8,8 @@ public class LocationDetail {
private String quantity; private String quantity;
private String lotNo;
public String getLocationNo() { public String getLocationNo() {
return locationNo; return locationNo;
} }
@@ -31,4 +33,12 @@ public class LocationDetail {
public void setQuantity(String quantity) { public void setQuantity(String quantity) {
this.quantity = quantity; this.quantity = quantity;
} }
public String getLotNo() {
return lotNo;
}
public void setLotNo(String lotNo) {
this.lotNo = lotNo;
}
} }

6
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
View File

@@ -371,7 +371,7 @@ public class ToErpServiceImpl implements IToErpService {
item.setSpecModel(detail.getSpec()); item.setSpecModel(detail.getSpec());
item.setUnit(detail.getUnit()); item.setUnit(detail.getUnit());
item.setQuantity(detail.getAssignNum()); item.setQuantity(detail.getAssignNum());
item.setLotNo(detail.getLotNo()); // item.setLotNo(detail.getLotNo());
item.setLevelRelation(detail.getSpare1()); item.setLevelRelation(detail.getSpare1());
item.setUpperMaterial(detail.getSpare2()); item.setUpperMaterial(detail.getSpare2());
item.setTopMaterial(detail.getSpare3()); item.setTopMaterial(detail.getSpare3());
@@ -385,6 +385,7 @@ public class ToErpServiceImpl implements IToErpService {
locationDetail.setLocationNo(splitLocation[i]); locationDetail.setLocationNo(splitLocation[i]);
locationDetail.setQuantity(splitQuantity[i]); locationDetail.setQuantity(splitQuantity[i]);
locationDetail.setAreaNo(splitArea[i]); locationDetail.setAreaNo(splitArea[i]);
locationDetail.setLotNo(detail.getLotNo());
locationDetails.add(locationDetail); locationDetails.add(locationDetail);
} }
item.setLocations(locationDetails); item.setLocations(locationDetails);
@@ -467,7 +468,7 @@ public class ToErpServiceImpl implements IToErpService {
item.setLevelRelation(detail.getSpare1()); item.setLevelRelation(detail.getSpare1());
item.setUpperMaterial(detail.getSpare2()); item.setUpperMaterial(detail.getSpare2());
item.setTopMaterial(detail.getSpare3()); item.setTopMaterial(detail.getSpare3());
item.setLotNo(detail.getLotNo()); // item.setLotNo(detail.getLotNo());
item.setRemark(detail.getRemark()); item.setRemark(detail.getRemark());
// item.setArea(detail.getSpare9()); // item.setArea(detail.getSpare9());
// item.setLocation(detail.getSpare8()); // item.setLocation(detail.getSpare8());
@@ -480,6 +481,7 @@ public class ToErpServiceImpl implements IToErpService {
locationDetail.setLocationNo(splitLocation[i]); locationDetail.setLocationNo(splitLocation[i]);
locationDetail.setQuantity(splitQuantity[i]); locationDetail.setQuantity(splitQuantity[i]);
locationDetail.setAreaNo(splitArea[i]); locationDetail.setAreaNo(splitArea[i]);
locationDetail.setLotNo(detail.getLotNo());
locationDetails.add(locationDetail); locationDetails.add(locationDetail);
} }
item.setLocations(locationDetails); item.setLocations(locationDetails);