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());