rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、无码收货的查询添加批次号的判断

This commit is contained in:
zhangke 2025-09-25 16:18:25 +08:00
parent 038b61449b
commit ce8e6a3494
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
View File

@ -705,10 +705,12 @@ public class NormalPGIController extends BaseController {
order.getSupplierNum(),
item.getItemCode(), item.getPoLineNumber());
VUtil.trueThrowBusinessError(Objects.isNull(materialInfoInOrder)).throwMessage("当前物料信息【" + item.getItemCode() + "】,订单号【" + item.getPoNum() + "】，供应商【" + order.getSupplierName() + "】在SAP中搜索不到有效信息");
String batchNumber = (materialInfoInOrder.getLbprt().equals("2")
|| materialInfoInOrder.getLbprt().equals("4")) ? NoUtil.getBatchNo(order.getSupplierNum()) : "";
qo.setItemName(materialInfoInOrder.getMaktx());
qo.setUomCode(materialInfoInOrder.getMeins());
qo.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo());
qo.setBatchNumber(NoUtil.getBatchNo(order.getSupplierNum()));
qo.setBatchNumber(batchNumber);
qo.setBinNos(materialInfoInOrder.getBinNos());
qo.setTransportNum(materialInfoInOrder.getTransportNum());
qo.setLbprt(materialInfoInOrder.getLbprt());
@ -878,7 +880,7 @@ public class NormalPGIController extends BaseController {
//序列号和批次号验证以及条码信息的组装
Long receiveItemId = IdUtil.getSnowflakeNextId();
List<SrmMaterialReceiptScanCodes> scanCodeQOS = new ArrayList<>();
List<SrmMaterialReceiptNoScanCodes> itemCodes = validateNoScanCodes(item, materialInfoInOrder, scanCodeQOS,receiveItemId);
List<SrmMaterialReceiptNoScanCodes> itemCodes = validateNoScanCodes(item, materialInfoInOrder, scanCodeQOS, receiveItemId);
if (CollectionUtil.isNotEmpty(itemCodes)) {
codes.addAll(itemCodes);
}

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
View File

@ -167,7 +167,8 @@ public class NormalPGIControllerService {
}
public List<SrmMaterialReceiptScanCodes> validateScanCodes(SrmMaterialReceiptQO item, SAPSyncParamsDTO materialInfoInOrder, Long receiveItemId) {
public List<SrmMaterialReceiptScanCodes> validateScanCodes(SrmMaterialReceiptQO item
, SAPSyncParamsDTO materialInfoInOrder, Long receiveItemId) {
String lbprt = materialInfoInOrder.getLbprt();
//判断序列号、批次号是否规范
// 1 - 批次号为空，序列号为空