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

推送逻辑修改;

Browse Source
This commit is contained in:
王奎兴
2026-06-12 18:01:45 +08:00
parent 2441f4eb1c
commit 453b6b6263
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+8 -3
View File
@@ -2319,7 +2319,7 @@ public class StockInOrderApplicationService {
Long shipperId = stockInOrder.getShipperId(); Long shipperId = stockInOrder.getShipperId();
String userNcCode = stockOutOrderMapper.getUserNcCode(shipperId); String userNcCode = stockOutOrderMapper.getUserNcCode(shipperId);
gwStockInOrder.setBillNo(stockInOrder.getInOrderNumber()); gwStockInOrder.setBillNo(stockInOrder.getInOrderNumber());
gwStockInOrder.setBillDate(stockInOrder.getDocumentDate()); gwStockInOrder.setBillDate(stockInOrder.getDocumentDate() == null ? stockInOrder.getCreateTime() : stockInOrder.getDocumentDate());
gwStockInOrder.setIeFlag("I"); gwStockInOrder.setIeFlag("I");
gwStockInOrder.setCorpCode(userNcCode); gwStockInOrder.setCorpCode(userNcCode);
@@ -2328,6 +2328,7 @@ public class StockInOrderApplicationService {
eq(InMaterialDetail::getInOrderNumber, stockInOrder.getInOrderNumber()) eq(InMaterialDetail::getInOrderNumber, stockInOrder.getInOrderNumber())
.eq(InMaterialDetail::getDelFlag, 1)); .eq(InMaterialDetail::getDelFlag, 1));
List<GwInDetail> orderList = new LinkedList<>(); List<GwInDetail> orderList = new LinkedList<>();
int index = 1;
for (InMaterialDetail reservationInMaterialDetail : reservationInMaterialDetails) { for (InMaterialDetail reservationInMaterialDetail : reservationInMaterialDetails) {
GwInDetail gwInDetail = new GwInDetail(); GwInDetail gwInDetail = new GwInDetail();
Long materialBaseInfoId = reservationInMaterialDetail.getMaterialBaseInfoId(); Long materialBaseInfoId = reservationInMaterialDetail.getMaterialBaseInfoId();
@@ -2336,10 +2337,14 @@ public class StockInOrderApplicationService {
if (lotNo != null) { if (lotNo != null) {
String[] split = lotNo.split("-"); String[] split = lotNo.split("-");
if (split.length == 2) { if (split.length == 2) {
gwInDetail.setLineNum(split[1]); gwInDetail.setLineNum(Integer.valueOf(split[1]));
} else {
gwInDetail.setLineNum(index);
} }
} else {
gwInDetail.setLineNum(index);
} }
index++;
gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName()); gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName());
MaterialBaseInfoPO materialBaseInfoPO = materialBaseInfoService.getInfo(materialBaseInfoId); MaterialBaseInfoPO materialBaseInfoPO = materialBaseInfoService.getInfo(materialBaseInfoId);
gwInDetail.setItemNo(materialBaseInfoPO.getMaterialCode()); gwInDetail.setItemNo(materialBaseInfoPO.getMaterialCode());
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+11 -5
View File
@@ -1544,7 +1544,7 @@ public class StockOutOrderApplicationService {
Map<String, Object> order = new HashMap<>(); Map<String, Object> order = new HashMap<>();
order.put("billNo", stockOutOrder.getOutOrderNumber()); order.put("billNo", stockOutOrder.getOutOrderNumber());
order.put("ieFlag", "E"); order.put("ieFlag", "E");
order.put("billDate", stockOutOrder.getDocumentDate()); order.put("billDate", stockOutOrder.getDocumentDate() == null ? stockOutOrder.getCreateTime() : stockOutOrder.getDocumentDate());
order.put("corpCode", userNcCode != null ? userNcCode : ""); order.put("corpCode", userNcCode != null ? userNcCode : "");
// 查询出库物料明细 // 查询出库物料明细
@@ -1563,6 +1563,7 @@ public class StockOutOrderApplicationService {
// 构建明细List<Map> // 构建明细List<Map>
List<Map<String, Object>> orderList = new ArrayList<>(); List<Map<String, Object>> orderList = new ArrayList<>();
int index = 1;
for (OutMaterialDetail detail : outMaterialDetails) { for (OutMaterialDetail detail : outMaterialDetails) {
Map<String, Object> item = new HashMap<>(); Map<String, Object> item = new HashMap<>();
item.put("billNo", stockOutOrder.getOutOrderNumber()); item.put("billNo", stockOutOrder.getOutOrderNumber());
@@ -1571,7 +1572,11 @@ public class StockOutOrderApplicationService {
String[] split = lotNo.split("-"); String[] split = lotNo.split("-");
if (split.length == 2) { if (split.length == 2) {
item.put("lineNum", split[1]); item.put("lineNum", split[1]);
} else {
item.put("lineNum", index);
} }
} else {
item.put("lineNum", index);
} }
item.put("itemNo", detail.getMaterialCode() != null ? detail.getMaterialCode().toString() : ""); item.put("itemNo", detail.getMaterialCode() != null ? detail.getMaterialCode().toString() : "");
item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : ""); item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : "");
@@ -1622,15 +1627,16 @@ public class StockOutOrderApplicationService {
item.put("orderIRow", split[1]); item.put("orderIRow", split[1]);
item.put("billIRow", split[1]); item.put("billIRow", split[1]);
} else { } else {
item.put("orderIRow", 1); item.put("orderIRow", index);
item.put("billIRow", 1); item.put("billIRow", index);
} }
} else { } else {
item.put("orderIRow", 1); item.put("orderIRow", index);
item.put("billIRow", 1); item.put("billIRow", index);
} }
} }
orderList.add(item); orderList.add(item);
index++;
} }
order.put("orderList", orderList); order.put("orderList", orderList);
mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/vo/GwInDetail.java
+1 -1
View File
@@ -9,7 +9,7 @@ public class GwInDetail {
//订单号 //订单号
private String billNo; private String billNo;
//订单行号 //订单行号
private String lineNum; private Integer lineNum;
//物料号 //物料号
private String itemNo; private String itemNo;
//物料名称 //物料名称