From 3fa179edf0993ce1a4dc9ed7d1b983238b710103 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Fri, 23 Aug 2024 14:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/purchase/ProxyPurchaseReturn.java | 18 +++++++++++++++--- .../plugin/purchase/ProxyPurchaseWarehous.java | 13 +++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java index 6c230b14..3a03bebf 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java @@ -19,15 +19,12 @@ import com.hzya.frame.plugin.lets.util.RdclUtil; import com.hzya.frame.ttxofs.dto.InterfaceParamDto; import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderBean; import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderData; -import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderDetails; -import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderHeader; import com.hzya.frame.ttxofs.dto.ofspurchasereturnorder.PurchaseReturnOrder; import com.hzya.frame.ttxofs.dto.ofspurchasereturnorder.PurchaseReturnOrderDetails; import com.hzya.frame.ttxofs.dto.ofspurchasereturnorder.PurchaseReturnOrderHeader; import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.DetailsDto; import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDetailsDto; import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDto; -import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; @@ -758,4 +755,19 @@ public class ProxyPurchaseReturn extends PluginBaseEntity { Assert.state(false, "根据OFS采购订单号:{}无法查询到OFS采购订单信息", code); return null; } + + /** + * 2024年8月23日 10:21:50 只保留代理品牌采购入库单 + * + * @param returnGoodHeaderDetailsDataDtoArrayList 查询得到的采购入库单 + * @author liuyang + */ + private List onlyImplementProxyOrder(List returnGoodHeaderDetailsDataDtoArrayList) { + List headerDetailsDtos = new ArrayList<>(); + // TODO 2024年8月23日 10:27:40 O采购单查询接口,没有采购类型字段,虽然接口文档里有一个类似的类型 + if (returnGoodHeaderDetailsDataDtoArrayList != null && returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { + + } + return headerDetailsDtos; + } } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehous.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehous.java index b5b2e69b..78ae9e6c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehous.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehous.java @@ -726,4 +726,17 @@ public class ProxyPurchaseWarehous extends PluginBaseEntity { } return null; } + + /** + * 仅保留代理品牌的采退出库单 + * + * @author liuyang + */ + private List onlyImplementProxyOrder(List returnGoodHeaderDetailsDataDtoArrayList) { + List stockinOrderList = new ArrayList<>(); + if (returnGoodHeaderDetailsDataDtoArrayList != null && returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { + + } + return stockinOrderList; + } } \ No newline at end of file