weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

W出口订单行号逻辑修改；

Browse Source
This commit is contained in:
王奎兴
2026-06-10 17:54:38 +08:00
parent fdd0693072
commit 7ec8be59ff
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+7 -3
View File
@@ -1967,14 +1967,18 @@ public class ReservationStockInOrderApplicationService {
List<ReservationInMaterialDetail> reservationInMaterialDetails = reservationInMaterialDetailMapper.selectList(new LambdaQueryWrapper<ReservationInMaterialDetail>().eq(ReservationInMaterialDetail::getInOrderNumber, reservationStockInOrder.getInOrderNumber())); List<ReservationInMaterialDetail> reservationInMaterialDetails = reservationInMaterialDetailMapper.selectList(new LambdaQueryWrapper<ReservationInMaterialDetail>().eq(ReservationInMaterialDetail::getInOrderNumber, reservationStockInOrder.getInOrderNumber()));
Integer lineNum = 1;
List<GwInDetail> orderList = new LinkedList<>(); List<GwInDetail> orderList = new LinkedList<>();
for (ReservationInMaterialDetail reservationInMaterialDetail : reservationInMaterialDetails) { for (ReservationInMaterialDetail reservationInMaterialDetail : reservationInMaterialDetails) {
GwInDetail gwInDetail = new GwInDetail(); GwInDetail gwInDetail = new GwInDetail();
Long materialBaseInfoId = reservationInMaterialDetail.getMaterialBaseInfoId(); Long materialBaseInfoId = reservationInMaterialDetail.getMaterialBaseInfoId();
gwInDetail.setBill_no(gwStockInOrder.getBill_no()); gwInDetail.setBill_no(gwStockInOrder.getBill_no());
gwInDetail.setLine_num(lineNum); String lotNo = reservationInMaterialDetail.getLotNo();
lineNum++; if (lotNo != null) {
String[] split = lotNo.split("-");
if (split.length == 2) {
gwInDetail.setLine_num(split[1]);
}
}
gwInDetail.setItem_no(materialBaseInfoId.toString()); gwInDetail.setItem_no(materialBaseInfoId.toString());
gwInDetail.setItem_name(reservationInMaterialDetail.getMaterialName()); gwInDetail.setItem_name(reservationInMaterialDetail.getMaterialName());
MaterialBaseInfoPO materialBaseInfoPO = reservationStockInOrderMapper.getinfo(materialBaseInfoId); MaterialBaseInfoPO materialBaseInfoPO = reservationStockInOrderMapper.getinfo(materialBaseInfoId);
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+7 -2
View File
@@ -1134,11 +1134,16 @@ public class ReservationStockOutOrderApplicationService {
// 构建明细List<Map> // 构建明细List<Map>
List<Map<String, Object>> orderList = new ArrayList<>(); List<Map<String, Object>> orderList = new ArrayList<>();
int lineNum = 1;
for (ReservationOutMaterialDetail detail : reservationOutMaterialDetails) { for (ReservationOutMaterialDetail detail : reservationOutMaterialDetails) {
Map<String, Object> item = new HashMap<>(); Map<String, Object> item = new HashMap<>();
item.put("billNo", reservationStockOutOrder.getOutOrderNumber()); item.put("billNo", reservationStockOutOrder.getOutOrderNumber());
item.put("lineNum", lineNum++); String lotNo = detail.getLotNo();
if (lotNo != null) {
String[] split = lotNo.split("-");
if (split.length == 2) {
item.put("lineNum", split[1]);
}
}
item.put("itemNo", detail.getMaterialBaseInfoId() != null ? detail.getMaterialBaseInfoId().toString() : ""); item.put("itemNo", detail.getMaterialBaseInfoId() != null ? detail.getMaterialBaseInfoId().toString() : "");
item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : ""); item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : "");
item.put("spec", detail.getSpecificationModel() != null ? detail.getSpecificationModel() : ""); item.put("spec", detail.getSpecificationModel() != null ? detail.getSpecificationModel() : "");