仓库管理发送erp增加修改

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<String> 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<String> deleteMoldPlan(@RequestParam("erpWoCode")String erpWoCode) throws BusinessException;
+
 }

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<String> deleteMoldPlan(@RequestParam("erpWoCode")String erpWoCode) {
+		return R.fail("获取数据失败");
+	}
 }

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<Void> deleteMoldPlan(String erpWoCode) throws BusinessException{
-//		erpDataWmsService.deleteMoldPlan(erpWoCode);
-//		return R.success("删除工装计划成功");
-//	}
+	@Override
+	public R<String> deleteMoldPlan(String erpWoCode) throws BusinessException {
+		return R.data(erpDataWmsService.deleteMoldPlan(erpWoCode));
+	}
 }

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;
 }

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<String, Object> inParams = new HashMap<>();
-//		inParams.put("v_toolid", erpWoCode);
-//
-//		// 3. 执行并获取结果 Map
-//		Map<String, Object> 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<String, Object> inParams = new HashMap<>();
+		inParams.put("v_toolid", erpWoCode);
+
+		// 3. 执行并获取结果 Map
+		Map<String, Object> 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;
+	}
 
 }

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java

@@ -89,7 +89,11 @@ public class StMoldApplyForServiceImpl extends BaseServiceImpl<StMoldApplyForMap
 				StMoldApplyFor plan = this.getById(id);
 				if (plan == null) continue;
 				if (!StMoldApplyFor.MAF_STATUS_OK.equals(plan.getMafStatus())) {
-					baseMapper.deleteMoldPlan(plan.getErpWoCode());   // 如仍有该过程，可保留
+					try {
+						erpDataWmsClient.deleteMoldPlan(plan.getErpWoCode());
+					} catch (BusinessException e) {
+						throw new RuntimeException("删除模具计划失败：" + e.getMessage());
+					}
 					plan.setMafStatus(StMoldApplyFor.MAF_STATUS_ERP_DEL);
 					this.updateById(plan);
 				}
@@ -105,14 +109,18 @@ public class StMoldApplyForServiceImpl extends BaseServiceImpl<StMoldApplyForMap
 				StMoldApplyFor plan = this.getById(id);
 				if (plan == null) continue;
 				if (!StMoldApplyFor.MAF_STATUS_OK.equals(plan.getMafStatus())) {
-					baseMapper.deleteMoldPlan(plan.getErpWoCode());
+					try {
+						erpDataWmsClient.deleteMoldPlan(plan.getErpWoCode());
+					} catch (BusinessException e) {
+						throw new RuntimeException("删除模具计划失败：" + e.getMessage());
+					}
+
 					plan.setMafStatus(StMoldApplyFor.MAF_STATUS_ERP_DEL);
 					this.updateById(plan);
 				}
 			}
-			this.deleteLogic(deleteIds);
 		}
-		return true;
+		return this.deleteLogic(deleteIds);
 	}
 
 	@Override