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

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmServices.java

@@ -8,7 +8,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 public class CallSrmServices extends BaseBean {
 
 	private static final org.slf4j.Logger logger_a535240a = LoggerFactory.getLogger(CallSrmServices.class);

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

@@ -173,9 +173,9 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ
                     } else {
                         if ("2".equals(newoperate)) {
                             // 正式formtable_main_2714,测试formtable_main_2252，formtable_main_2401
-                            boolean billingno = rs.execute("update e10_core_business.dbo.formtable_main_2401 set hkdh='" + ret.get("billingno") + "' where id=" + requestid);
+                            boolean billingno = rs.execute("update e10_core_business.dbo.formtable_main_2714 set hkdh='" + ret.get("billingno") + "' where id=" + requestid);
                             logger_c29b3679.error( "ret--" + ret.toString()) ;
-                            logger_c29b3679.error("sql　＝　" +"update e10_core_business.dbo.formtable_main_2401 set hkdh='" + ret.get("billingno") + "' where id=" + requestid);
+                            logger_c29b3679.error("sql　＝　" +"update e10_core_business.dbo.formtable_main_2714 set hkdh='" + ret.get("billingno") + "' where id=" + requestid);
                             logger_c29b3679.error("billingno　＝　" +billingno);
                         }
                     }

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

@@ -126,7 +126,10 @@ public class NewBuKaAction extends BaseBean implements Action, EsbServerlessRpcR
                     logger_eae3b780.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId);
                     SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser();
                     Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id
+                    logger_eae3b780.error("recodId:" + recodId);
+
                     String sql = "update e10_common.dbo.buka_log_new set requestid = " + requestid + ",gh = '" + GH + "',punchreason='" + bkyy + "',punchtype='" + kz + "',TimeCardDate='" + qksj + "',TimeCardTime='" + bkrq + " " + bksj + "',createrId='" + createrId + "',BKRQ='" + BKRQ + "' where id  =  " + recodId + " and delete_type = 0 ";
+                    logger_eae3b780.error("sql1:" + sql);
                     boolean b1 = rs.executeSql(sql, poolname);
                     logger_eae3b780.error("b1--"+b1);
                     logger_eae3b780.error(String.valueOf("sql1:" + sql));

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

@@ -121,9 +121,7 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe
                     // 现有合格供应商
                     String xyhggys = String.valueOf(map.get("XYHGGYSMC"));
                     VdDlvApplyHandlerServiceServiceStub.DlvApplyIn dlvapplyin = new VdDlvApplyHandlerServiceServiceStub.DlvApplyIn();
-                    logger_9af84826.error("setRequestId  ========start=============");
                     dlvapplyin.setRequestId(Integer.parseInt(getFormno(requestid)));
-                    logger_9af84826.error("setRequestId  =========end============");
                     dlvapplyin.setApplyNo(lcbh);
                     dlvapplyin.setCompanyCode(sqdwbm);
                     dlvapplyin.setCompanyName(sqdw);

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

@@ -153,11 +153,8 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe
                         // 现有合格供应商
                         String xyhggys = String.valueOf(map.get("XYHGGYSMC"));
                         VdDlvApplyHandlerServiceServiceStub.DlvApplyIn dlvapplyin = new VdDlvApplyHandlerServiceServiceStub.DlvApplyIn();
-                        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);