From 444db74c51b458018e706dd16ac7426c14be016f Mon Sep 17 00:00:00 2001 From: xinfengYin <1776570748@qq.com> Date: Tue, 25 Feb 2025 14:10:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?#xinfengYin-10#=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/weaver/seconddev/interfaces/srmoa/CallSrmServices.java | 2 ++ .../interfaces/workflow/action/OaSrmVendorAdmitAction.java | 2 -- .../interfaces/workflow/action/OaSrmVendorCheckAction.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmServices.java index 808295c..f6e2fc3 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmServices.java +++ b/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); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java index 37c2ec3..fa11ca1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java +++ b/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); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java index b0dd392..3eda519 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java +++ b/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); From b60567230940d687fe66d9616defc586ad8fb0f0 Mon Sep 17 00:00:00 2001 From: yangzt Date: Tue, 25 Feb 2025 14:56:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?yzt-20250224-=E9=97=AE=E9=A2=98=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=BA=8F=E5=8F=B7633-=E6=8E=A5=E5=8F=A3=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seconddev/interfaces/workflow/action/NewBuKaAction.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java index d3867f2..5a97836 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java +++ b/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)); From b3c9d2784201102b74d24d3ec364278fad8dc5c5 Mon Sep 17 00:00:00 2001 From: yangzt Date: Tue, 25 Feb 2025 15:36:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?yzt-20250225-=E9=97=AE=E9=A2=98=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=BA=8F=E5=8F=B7648-=E6=8E=A5=E5=8F=A3=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/workflow/action/ARSPaymentRecepitAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java index 22487d4..b507325 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java +++ b/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); } }