From f12a12addf6340e13d5a24d2e9a6bb0fb7cc541c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 15 Dec 2023 16:08:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasereturnRequestMainServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 55e7f429..1332e121 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -474,15 +474,15 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque detailDo.setItemDesc2(itembasicDO.getDesc2()); detailDo.setItemName(itembasicDO.getName()); detailDo.setProjectCode(itembasicDO.getProject()); - this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom()); - validatorLocation(detailDo.getFromLocationCode()); - if(mainDo.getPurchaseReceiptRecordNumber() != null && !mainDo.getPurchaseReceiptRecordNumber().isEmpty()) { - PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch()); - PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); - mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber()); - mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber()); - ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty()); - } +// this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom()); +// validatorLocation(detailDo.getFromLocationCode()); +// if(mainDo.getPurchaseReceiptRecordNumber() != null && !mainDo.getPurchaseReceiptRecordNumber().isEmpty()) { +// PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch()); +// PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); +// mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber()); +// mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber()); +// ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty()); +// } BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); List inventoryStatusList = Arrays.asList(businesstypeDO.getOutInventoryStatuses().split(",")); BigDecimal bigDecimal = validatorBalance(detailDo, mainDo, inventoryStatusList);