From 0055e8caa0a78e4432927ef3a5ad580c3d580cfd Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Tue, 28 Apr 2026 18:04:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E5=8F=91?= =?UTF-8?q?=E9=80=81erp=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erpdata/feign/IErpDataWmsClient.java | 9 +++ .../feign/IErpDataWmsClientFallback.java | 5 ++ .../erpdata/feign/ErpDataWmsClient.java | 9 ++- .../erpdata/service/IErpDataWmsService.java | 2 +- .../service/impl/ErpDataWmsServiceImpl.java | 65 ++++++++++--------- .../impl/StMoldApplyForServiceImpl.java | 16 +++-- 6 files changed, 64 insertions(+), 42 deletions(-) diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataWmsClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataWmsClient.java index 7f6ce12c..57aecdf1 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataWmsClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataWmsClient.java @@ -31,6 +31,8 @@ public interface IErpDataWmsClient { String CREATE_MOLD_PLAN = API_PREFIX + "/createMoldPlan"; + String DELETE_MOLD_PLAN = API_PREFIX + "/deleteMoldPlan"; + /** * 到期送检发送erp */ @@ -50,4 +52,11 @@ public interface IErpDataWmsClient { R createMoldPlan(@RequestParam("partCode")String partCode, @RequestParam("moCode")String moCode, @RequestParam("plantype")String plantype, @RequestParam("quantity")Double quantity, @RequestParam("needDate")Date needDate, @RequestParam("level")String level, @RequestParam("keeper")String keeper, @RequestParam("createMan")String createMan, @RequestParam("memo")String memo, @RequestParam("urgentType")String urgentType, @RequestParam("erpWoCode")String erpWoCode) throws BusinessException; + + /** + * 工装计划申报删除发送erp + */ + @GetMapping(DELETE_MOLD_PLAN) + R deleteMoldPlan(@RequestParam("erpWoCode")String erpWoCode) throws BusinessException; + } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataWmsClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataWmsClientFallback.java index 44b7028e..ccdf1e55 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataWmsClientFallback.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataWmsClientFallback.java @@ -33,4 +33,9 @@ public class IErpDataWmsClientFallback implements IErpDataWmsClient{ @RequestParam("memo")String memo, @RequestParam("urgentType")String urgentType, @RequestParam("erpWoCode")String erpWoCode) { return R.fail("获取数据失败"); } + + @Override + public R deleteMoldPlan(@RequestParam("erpWoCode")String erpWoCode) { + return R.fail("获取数据失败"); + } } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataWmsClient.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataWmsClient.java index 3524da9e..4e1777b1 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataWmsClient.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataWmsClient.java @@ -43,9 +43,8 @@ public class ErpDataWmsClient implements IErpDataWmsClient{ keeper, createMan, memo, urgentType, erpWoCode)); } -// @Override -// public R deleteMoldPlan(String erpWoCode) throws BusinessException{ -// erpDataWmsService.deleteMoldPlan(erpWoCode); -// return R.success("删除工装计划成功"); -// } + @Override + public R deleteMoldPlan(String erpWoCode) throws BusinessException { + return R.data(erpDataWmsService.deleteMoldPlan(erpWoCode)); + } } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataWmsService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataWmsService.java index b8d0e740..103a0d5f 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataWmsService.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataWmsService.java @@ -22,5 +22,5 @@ public interface IErpDataWmsService { String createMoldPlan(String partCode, String moCode, String plantype, Double quantity, Date needDate, String level, String keeper, String createMan, String memo, String urgentType, String erpWoCode) throws BusinessException; -// void deleteMoldPlan(String erpWoCode) throws BusinessException; + String deleteMoldPlan(String erpWoCode) throws BusinessException; } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataWmsServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataWmsServiceImpl.java index fae842e3..5e24db8f 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataWmsServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataWmsServiceImpl.java @@ -39,7 +39,7 @@ public class ErpDataWmsServiceImpl implements IErpDataWmsService { // 1. 创建存储过程调用 SimpleJdbcCall jdbcCall = new SimpleJdbcCall(jdbcTemplate) // 存储过程名 + DBLink - .withProcedureName("dba_mgr.pro_rbprtchk@erp_mes_link") + .withProcedureName("dba_mgr.pro_rbprtchk") // 关闭元数据（DBLink必须加） .withoutProcedureColumnMetaDataAccess() // 声明参数：顺序必须和存储过程一致！ @@ -86,7 +86,7 @@ public class ErpDataWmsServiceImpl implements IErpDataWmsService { public String sendErpBuyRequest(String extraBill, Double qty, String ldapName) throws BusinessException{ SimpleJdbcCall jdbcCall = new SimpleJdbcCall(jdbcTemplate) // 指定存储过程名（包含 DB Link） - .withProcedureName("dba_mgr.pro_rbinvdeptreqmtn@erp_mes_link") + .withProcedureName("dba_mgr.pro_rbinvdeptreqmtn") // 关闭元数据访问（DBLink 必须加） .withoutProcedureColumnMetaDataAccess() // 显式声明参数（顺序必须和存储过程一致） @@ -125,7 +125,7 @@ public class ErpDataWmsServiceImpl implements IErpDataWmsService { SimpleJdbcCall jdbcCall = new SimpleJdbcCall(jdbcTemplate) // 指定存储过程名（包含 DB Link） - .withProcedureName("dba_mgr.pro_rbtoolreqm@erp_mes_link") + .withProcedureName("dba_mgr.pro_rbtoolreqm") // 关闭元数据访问（DBLink 必须加） .withoutProcedureColumnMetaDataAccess() // 显式声明参数（顺序必须和存储过程一致） @@ -178,34 +178,35 @@ public class ErpDataWmsServiceImpl implements IErpDataWmsService { return wxno; } -// @Override -// public void deleteMoldPlan(String erpWoCode) throws BusinessException { -// SimpleJdbcCall jdbcCall = new SimpleJdbcCall(jdbcTemplate) -// // 指定存储过程名（包含 DB Link） -// .withProcedureName("dba_mgr.pro_rbtooldel@erp_mes_link") -// // 关闭元数据访问（DBLink 必须加） -// .withoutProcedureColumnMetaDataAccess() -// // 显式声明参数 -// .declareParameters( -// new SqlParameter("v_toolid", Types.VARCHAR), // IN -// new SqlOutParameter("v_excnote", Types.VARCHAR), // OUT -// new SqlOutParameter("v_excflag", Types.VARCHAR) // OUT -// ); -// // 2. 封装输入参数 -// Map inParams = new HashMap<>(); -// inParams.put("v_toolid", erpWoCode); -// -// // 3. 执行并获取结果 Map -// Map resultMap = jdbcCall.execute(inParams); -// -// // 4. 提取输出参数 -// String excflag = (String) resultMap.get("v_excflag"); -// String excnote = (String) resultMap.get("v_excnote"); -// -// // 5. 业务判断 -// if ("0".equals(excflag)) { -// throw new BusinessException("删除工装计划失败" + excnote); -// } -// } + @Override + public String deleteMoldPlan(String erpWoCode) throws BusinessException { + SimpleJdbcCall jdbcCall = new SimpleJdbcCall(jdbcTemplate) + // 指定存储过程名（包含 DB Link） + .withProcedureName("dba_mgr.pro_rbtooldel") + // 关闭元数据访问（DBLink 必须加） + .withoutProcedureColumnMetaDataAccess() + // 显式声明参数 + .declareParameters( + new SqlParameter("v_toolid", Types.VARCHAR), // IN + new SqlOutParameter("v_excnote", Types.VARCHAR), // OUT + new SqlOutParameter("v_excflag", Types.VARCHAR) // OUT + ); + // 2. 封装输入参数 + Map inParams = new HashMap<>(); + inParams.put("v_toolid", erpWoCode); + + // 3. 执行并获取结果 Map + Map resultMap = jdbcCall.execute(inParams); + + // 4. 提取输出参数 + String excflag = (String) resultMap.get("v_excflag"); + String excnote = (String) resultMap.get("v_excnote"); + + // 5. 业务判断 + if ("0".equals(excflag)) { + throw new BusinessException("删除工装计划失败" + excnote); + } + return excflag; + } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java index a5fc48ef..d3e5f08a 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java @@ -89,7 +89,11 @@ public class StMoldApplyForServiceImpl extends BaseServiceImpl