From 4d5089a804c1557e904a492f84257b11597b1796 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Wed, 4 Jun 2025 15:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7PO=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8D=E7=A7=B0;?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6(SRM)=E6=93=8D=E4=BD=9C=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=8F=90=E9=86=92=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/OdsProcureOrderServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index c74f126f3..95a327797 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -18,6 +18,7 @@ import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.system.api.RemoteOpenService; @@ -171,7 +172,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { // @DS("#header.poolName") public List PurchaseOrderPda(OdsProcureOrder odsProcureOrder) { DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); - return odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder); + List orderList= odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder); + for (OdsProcureOrder order: orderList) { + String name = odsProcureOrderMapper.selectBaseSupplier(order); + order.setSupplierName(name); + } + return orderList; } @Override @@ -1546,6 +1552,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } }else {////失败| result1="暂收失败"; + if (StringUtils.isNotEmpty(result2.getMsg())) { + result1=result2.getMsg(); + } for (OdsProcureOrder order : orderList1) { OdsProcureOrder order2 = odsProcureOrderMapper.selectOdsProcureOrderByID(order.getID());