采购收货PO显示供应商名称;采购收(SRM)操作失败提醒调整

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<OdsProcureOrder> PurchaseOrderPda(OdsProcureOrder odsProcureOrder) {
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
-        return odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder);
+        List<OdsProcureOrder> 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());