diff --git a/src/main/java/com/glxp/api/http/ErpInvClient.java b/src/main/java/com/glxp/api/http/ErpInvClient.java index 1347fd3a7..d3e21d7f9 100644 --- a/src/main/java/com/glxp/api/http/ErpInvClient.java +++ b/src/main/java/com/glxp/api/http/ErpInvClient.java @@ -79,7 +79,7 @@ public class ErpInvClient { } public BaseResponse> getInvSfResult(FilterInvProductRequest invProductRequest) { - ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(invProductRequest.getThirdSys()); +// ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(invProductRequest.getThirdSys()); // String url = basicThirdSysEntity.getThridUrl() + invProductRequest.getThirdSysUrlValue(); String url = "http://192.168.0.166:9997/udiwms/erp/inv/getInvFeeResult"; try { @@ -95,7 +95,7 @@ public class ErpInvClient { } public BaseResponse> getInvPhResult(FilterInvProductRequest invProductRequest) { - ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(invProductRequest.getThirdSys()); +// ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(invProductRequest.getThirdSys()); // String url = basicThirdSysEntity.getThridUrl() + invProductRequest.getThirdSysUrlValue(); String url = "http://192.168.0.166:9997/udiwms/erp/inv/getInvResult"; try { @@ -111,7 +111,7 @@ public class ErpInvClient { } public BaseResponse> getInvGhResult(FilterInvProductRequest invProductRequest) { - ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(invProductRequest.getThirdSys()); +// ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(invProductRequest.getThirdSys()); // String url = basicThirdSysEntity.getThridUrl() + invProductRequest.getThirdSysUrlValue(); String url = "http://192.168.0.166:9997/udiwms/erp/inv/getInvCodeResult"; try { diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index bd05a6562..9b90f8a33 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -596,3 +596,40 @@ CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'udiCode',' varchar(255) NULL CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'serialNo',' varchar(255) NULL DEFAULT NULL COMMENT ''序列号'' AFTER `remark`', 1); CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'sickerCode',' varchar(80) NULL DEFAULT NULL COMMENT ''患者编码'' AFTER `remark`', 1); CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'sickerName',' varchar(30) NULL DEFAULT NULL COMMENT ''患者名称'' AFTER `remark`', 1); + + + +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (75, '收费出入库明细下载', 'invSfOrderUrl', '/udiwms/erp/inv/getInvSfResult', 1, '1', '', 'thirdId', 1, 3, 1440, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (76, '收费出入库明细下载', 'invSfOrderUrl', '', 1, '1', '', 'thirdId1', 1, 3, NULL, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (77, '收费出入库明细下载', 'invSfOrderUrl', '', 1, '1', '', 'thirdId2', 1, 3, NULL, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (78, '收费出入库明细下载', 'invSfOrderUrl', '', 1, '1', '', 'thirdId3', 1, 3, NULL, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (79, '收费出入库明细下载', 'invSfOrderUrl', '', 1, '1', '', 'thirdId4', 1, 3, NULL, NULL); + +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (90, '普耗出入库明细下载', 'invPhOrderUrl', '/udiwms/erp/inv/getInvPhResult', 1, '1', '', 'thirdId', 1, 3, 1440, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (91, '普耗出入库明细下载', 'invPhOrderUrl', '', 1, '1', '', 'thirdId1', 1, 3, NULL, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (92, '普耗出入库明细下载', 'invPhOrderUrl', '', 1, '1', '', 'thirdId2', 1, 3, NULL, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (93, '普耗出入库明细下载', 'invPhOrderUrl', '', 1, '1', '', 'thirdId3', 1, 3, NULL, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (94, '普耗出入库明细下载', 'invPhOrderUrl', '', 1, '1', '', 'thirdId4', 1, 3, NULL, NULL); + + +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (95, '高耗出入库明细下载', 'invGhOrderUrl', '/udiwms/erp/inv/getInvGhResult', 1, '1', '', 'thirdId', 1, 3, 1440, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (96, '高耗出入库明细下载', 'invGhOrderUrl', '', 1, '1', '', 'thirdId1', 1, 3, NULL, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (97, '高耗出入库明细下载', 'invGhOrderUrl', '', 1, '1', '', 'thirdId2', 1, 3, NULL, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (98, '高耗出入库明细下载', 'invGhOrderUrl', '', 1, '1', '', 'thirdId3', 1, 3, NULL, NULL); +INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) +VALUES (99, '高耗出入库明细下载', 'invGhOrderUrl', '', 1, '1', '', 'thirdId4', 1, 3, NULL, NULL); +