From 91831843f3b9fa4c9f29e518e10dae5d3f9aead8 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 10:40:51 +0800
Subject: [PATCH] 增加几种出入库单类型
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java | 84 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 21 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java
index c9e3abf..45960c9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java
@@ -104,16 +104,18 @@
private DapIlcwmsCompletionLine buildInOutLine(InOutResultReportParam param, boolean inbound) {
RemotesInfoProperties.Dap dap = erpApi.getDap();
+ CloudMatnrParts matnrParts = parseCloudMatnr(param.getMatNr());
DapIlcwmsCompletionLine line = new DapIlcwmsCompletionLine()
.setOrgNo(dap.getOrgNo())
.setDocType(inbound ? dap.getDocTypeIn() : dap.getDocTypeOut())
.setDocNo(param.getOrderNo())
.setDocSeqNo(StringUtils.isNotBlank(param.getLineId()) ? param.getLineId() : "1")
- .setItemNo(param.getMatNr())
+ // 鎸変簯浠撹鍒欐媶鍒嗙墿鏂欑紪鐮�
+ .setItemNo(matnrParts.getItemNo())
.setQty(parseQty(param.getQty()))
.setUnitNo(dap.getUnitNo())
- .setCombinationLotNo(param.getBatch())
- .setBarcode(resolveBarcode(param));
+ .setCombinationLotNo(matnrParts.getCombinationLotNo())
+ .setBarcode(matnrParts.getBarcode());
if (inbound) {
line.setInWarehouseNo(param.getWareHouseId()).setInCellNo(param.getLocId());
} else {
@@ -134,16 +136,18 @@
String docSeq = docSeqOverride != null ? docSeqOverride
: (StringUtils.isNotBlank(param.getDocSeqNo()) ? param.getDocSeqNo() : "1");
String unit = StringUtils.isNotBlank(param.getUnitNo()) ? param.getUnitNo() : dap.getUnitNo();
+ CloudMatnrParts matnrParts = parseCloudMatnr(param.getMatNr());
DapIlcwmsCompletionLine line = new DapIlcwmsCompletionLine()
.setOrgNo(dap.getOrgNo())
.setDocType(docType)
.setDocNo(docNo)
.setDocSeqNo(docSeq)
- .setItemNo(param.getMatNr())
+ // 鎸変簯浠撹鍒欐媶鍒嗙墿鏂欑紪鐮�
+ .setItemNo(matnrParts.getItemNo())
.setQty(parseQty(param.getQty()))
.setUnitNo(unit)
- .setCombinationLotNo(param.getBatch())
- .setBarcode(resolveAdjustBarcode(param));
+ .setCombinationLotNo(matnrParts.getCombinationLotNo())
+ .setBarcode(matnrParts.getBarcode());
if (fillIn) {
line.setInWarehouseNo(param.getWareHouseId());
line.setInCellNo(StringUtils.isNotBlank(param.getTargetLocId()) ? param.getTargetLocId() : param.getSourceLocId());
@@ -169,27 +173,65 @@
return dap.getDocTypeIn();
}
- private static String resolveBarcode(InOutResultReportParam param) {
- if (StringUtils.isNotBlank(param.getBarcode())) {
- return param.getBarcode();
+ // private static String resolveBarcode(InOutResultReportParam param) {
+ // if (StringUtils.isNotBlank(param.getBarcode())) {
+ // return param.getBarcode();
+ // }
+ // if (StringUtils.isNotBlank(param.getPalletId())) {
+ // return param.getPalletId();
+ // }
+ // if (param.getMatNr() != null && param.getLocId() != null) {
+ // return param.getMatNr() + ":" + param.getLocId();
+ // }
+ // return param.getMatNr();
+ // }
+ //
+ // private static String resolveAdjustBarcode(InventoryAdjustReportParam param) {
+ // if (StringUtils.isNotBlank(param.getBarcode())) {
+ // return param.getBarcode();
+ // }
+ // if (StringUtils.isNotBlank(param.getPalletId())) {
+ // return param.getPalletId();
+ // }
+ // return param.getMatNr();
+ // }
+
+ /**
+ * 浜戜粨鍥炴姤瀛楁鏄犲皠锛氫笁娈靛紡鍙栧墠涓ゆ锛宐arcode 淇濈暀鍘熶覆銆�
+ */
+ private static CloudMatnrParts parseCloudMatnr(String matNr) {
+ if (StringUtils.isBlank(matNr)) {
+ return new CloudMatnrParts(null, null, null);
}
- if (StringUtils.isNotBlank(param.getPalletId())) {
- return param.getPalletId();
+ String[] arr = matNr.split("#", -1);
+ if (arr.length >= 3) {
+ return new CloudMatnrParts(arr[0], arr[1], matNr);
}
- if (param.getMatNr() != null && param.getLocId() != null) {
- return param.getMatNr() + ":" + param.getLocId();
- }
- return param.getMatNr();
+ return new CloudMatnrParts(matNr, null, matNr);
}
- private static String resolveAdjustBarcode(InventoryAdjustReportParam param) {
- if (StringUtils.isNotBlank(param.getBarcode())) {
- return param.getBarcode();
+ private static class CloudMatnrParts {
+ private final String itemNo;
+ private final String combinationLotNo;
+ private final String barcode;
+
+ private CloudMatnrParts(String itemNo, String combinationLotNo, String barcode) {
+ this.itemNo = itemNo;
+ this.combinationLotNo = combinationLotNo;
+ this.barcode = barcode;
}
- if (StringUtils.isNotBlank(param.getPalletId())) {
- return param.getPalletId();
+
+ public String getItemNo() {
+ return itemNo;
}
- return param.getMatNr();
+
+ public String getCombinationLotNo() {
+ return combinationLotNo;
+ }
+
+ public String getBarcode() {
+ return barcode;
+ }
}
private static Double parseQty(String q) {
--
Gitblit v1.9.1