Merge remote-tracking branch 'origin/ht' into ht

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java

@@ -153,7 +153,11 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe
                         // 现有合格供应商
                         String xyhggys = String.valueOf(map.get("XYHGGYSMC"));
                         VdDlvApplyHandlerServiceServiceStub.DlvApplyIn dlvapplyin = new VdDlvApplyHandlerServiceServiceStub.DlvApplyIn();
-                        dlvapplyin.setRequestId(Integer.parseInt(requestid));
+                        logger_a864d799.error("111111"+requestid);
+                        int  requestidIntTemp = Integer.parseInt(getFormno(requestid));
+                        logger_a864d799.error("2222"+requestidIntTemp);
+                        dlvapplyin.setRequestId(requestidIntTemp);
+                        logger_a864d799.error("333333333333");
                         dlvapplyin.setApplyNo(lcbh);
                         dlvapplyin.setCompanyCode(sqdwbm);
                         dlvapplyin.setCompanyName(sqdw);
@@ -453,6 +457,16 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe
         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);