From 17de40acb229ff6c3c69199e0088fa4c2af674cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 21 Dec 2023 08:31:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ProductionreturnRecordMainBaseVO.java | 1 - .../ProductionreturnRecordMainServiceImpl.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainBaseVO.java index 577e31a3..89d6e23e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainBaseVO.java @@ -24,7 +24,6 @@ public class ProductionreturnRecordMainBaseVO { private Long id; @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "申请单号不能为空") private String requestNumber; @Schema(description = "任务单号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java index a34a7f23..de9030f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java @@ -124,13 +124,13 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe for (ProductionreturnRecordDetailDO detailDO : subDOList) { detailDO.setMasterId(mainDO.getId()); detailDO.setNumber(number); - LocationDO locationDOFrom = locationService.selectLocation(detailDO.getFromLocationCode()); - if(locationDOFrom != null) { - detailDO.setFromAreaCode(locationDOFrom.getAreaCode()); - detailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode()); - } else { - throw exception(LOCATION_NOT_EXISTS); - } +// LocationDO locationDOFrom = locationService.selectLocation(detailDO.getFromLocationCode()); +// if(locationDOFrom != null) { +// detailDO.setFromAreaCode(locationDOFrom.getAreaCode()); +// detailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode()); +// } else { +// throw exception(LOCATION_NOT_EXISTS); +// } LocationDO locationDOTo = locationService.selectLocation(detailDO.getToLocationCode()); if(locationDOTo != null) { detailDO.setToAreaCode(locationDOTo.getAreaCode()); @@ -149,7 +149,7 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe throw exception(ITEMBASIC_NOT_EXISTS); } //查询库存余额 - BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode()); + BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getToLocationCode()); if (balanceDO == null) { throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); }