From 125094551426244e36385b76ff7c4ef7641a23b0 Mon Sep 17 00:00:00 2001
From: xinfengYin <1776570748@qq.com>
Date: Tue, 4 Mar 2025 16:22:53 +0800
Subject: [PATCH] =?UTF-8?q?#xinfengYin-19#=20GY103-=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=BC=95=E5=85=A5=E3=80=81=E8=BD=AC=E6=AD=A3=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=B5=81=E7=A8=8B-09?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../action/OaSrmVendorSyncAction.java         | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java
index eb74176..cc3e1a8 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java
@@ -87,7 +87,10 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
                 // 是否推送erp
                 String sftserp = map.get("SFTSERP");
                 // 流程编号
-                String lcbh = map.get("LCBH");
+                String lcbh = getFormno(requestid);
+                if (!"".equals(map.get("LCBH")) && map.get("LCBH") != null) {
+                    lcbh = map.get("LCBH");
+                }
                 // 公司编码
                 String sqdwbm = map.get("GSBM");
                 // 公司名称
@@ -131,7 +134,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
                     String shsj = timetype.format(now);
                     String shyj = requestinfo.getRequestManager().getRemark();
                     OaSrmVendorPropmtionServiceServiceStub.OaInputVendor oainputvendor = new OaSrmVendorPropmtionServiceServiceStub.OaInputVendor();
-                    oainputvendor.setRequestId(requestid);
+                    oainputvendor.setRequestId(getFormno(requestid));
                     oainputvendor.setLcbh(lcbh);
                     oainputvendor.setSqdwbm(sqdwbm);
                     oainputvendor.setSqdw(sqdw);
@@ -226,9 +229,13 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
                     Set<String> set = new HashSet<String>();
                     DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
                     // 指定明细表
-                    DetailTable dtq = detailtable[1];
+                    DetailTable dtq = null;
+                    if(dtq != null){
+                        dtq =  detailtable[1];
+                    }
                     // 当前明细表的所有数据,按行存储
-                    Row[] sq = dtq.getRow();
+                    Row[] sq = null;
+                    if(dtq != null){sq = dtq.getRow();}
                     int dtcount = 0;
                     String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt2 b where a.form_data_id=b.form_data_id and a.id =" + requestid;
                     logger_41a64316.error("sql-->" + sql);
@@ -238,7 +245,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
                     logger_41a64316.error(String.valueOf("b-->" + b));
                     dtcount = rs.getCounts();
                     logger_41a64316.error(String.valueOf(requestid + " dt2count:" + dtcount));
-                    if (sq.length <= 300 && sq.length > 0) {
+                    if (sq != null && sq.length <= 300 && sq.length > 0) {
                         SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT();
                         VenMatExtResultIn paramInfo = new VenMatExtResultIn();
                         VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount];
@@ -386,6 +393,16 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
         return outStr;
     }
 
+    public String getFormno(String requestid){
+        String formno = "";
+        if(requestid.length()>8){
+            formno = "1"+requestid.substring(requestid.length()-8);
+        }else{
+            formno = requestid;
+        }
+        return formno;
+    }
+
     Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
         if (key != null && !key.isEmpty()) {
             map.put(key, value);