diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java index 0d8e14df..8c508dfa 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java @@ -147,7 +147,7 @@ public class ComponentOutboundController { .setItSernr(new ArrayList<>()) .setItSernrPatch(new ArrayList<>()) .setIType("A") - .setIvDelivery(packing.getVbeln()); + .setIvDelivery(packing.getVbelv()); for (ComponentOutboundItemInputQO item : request.getItems()) { WmsComponentOutboundItem outboundItem = setWmsComponentOutboundItem(packing, item, packingItems, outbound); if (Objects.isNull(outboundItem)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java index fdc93f27..1083e8f8 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java @@ -2,6 +2,7 @@ package com.nflg.wms.admin.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.StrUtil; import com.nflg.wms.admin.service.ComponentPackingControllerService; import com.nflg.wms.admin.service.SapService; import com.nflg.wms.common.pojo.ApiResult; @@ -92,6 +93,9 @@ public class ComponentPackingController { @PostMapping("getorders") public ApiResult getComponentOrders(@Valid @RequestBody ComponentOrderQO request) { ZWM3A19DTO result = sapService.zwm3a19(request.getVbelv(), request.getWerks()); + VUtil.trueThrowBusinessError(StrUtil.isBlank(result.getHeadDTO().getWbstk()) + || result.getHeadDTO().getWbstk().equalsIgnoreCase("C")) + .throwMessage("此交货单已完成了过账"); return ApiResult.success(result); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPacking.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPacking.java index 222154a9..a4ec3b2c 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPacking.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPacking.java @@ -108,7 +108,7 @@ public class WmsComponentPacking implements Serializable { private String huodh; /** - * 起始凭证 + * 起始凭证(交货单号) */ private String vbelv;