UDI
/
udi-wms-third-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

切换分支备份

Browse Source
scpwxyy
yewj 9 months ago
parent 7b2e36e596
commit 5335397ed8
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File

11
src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
Unescape Escape View File

@ -1399,7 +1399,7 @@ public class CtqyyClient extends CommonHttpClient {
IPage<VYpzsPresInfo> page = vYpzsPresInfoMapper.selectGroupedWithPagination(new Page<VYpzsPresInfo>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), IPage<VYpzsPresInfo> page = vYpzsPresInfoMapper.selectGroupedWithPagination(new Page<VYpzsPresInfo>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),
udiwmsBasicSkPrescribeRequest); udiwmsBasicSkPrescribeRequest);
if (page.getTotal() == 0){ if (page.getTotal() == 0) {
PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(null); pageSimpleResponse.setList(null);
@ -1431,7 +1431,7 @@ public class CtqyyClient extends CommonHttpClient {
//拉取处方退货时，改成拉取v_ypzs_pres_info_return //拉取处方退货时，改成拉取v_ypzs_pres_info_return
IPage<VYpzsPresInfoReturn> page = vYpzsPresInfoReturnMapper.selectGroupedWithPagination(new Page<VYpzsPresInfoReturn>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), IPage<VYpzsPresInfoReturn> page = vYpzsPresInfoReturnMapper.selectGroupedWithPagination(new Page<VYpzsPresInfoReturn>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),
udiwmsBasicSkPrescribeRequest); udiwmsBasicSkPrescribeRequest);
if (page.getTotal() == 0){ if (page.getTotal() == 0) {
PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(null); pageSimpleResponse.setList(null);
@ -1683,7 +1683,7 @@ public class CtqyyClient extends CommonHttpClient {
IPage<VInsurNationGoodsCl> page = vInsurNationGoodsClMapper.selectGroupedWithPagination(new Page<VInsurNationGoodsCl>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), IPage<VInsurNationGoodsCl> page = vInsurNationGoodsClMapper.selectGroupedWithPagination(new Page<VInsurNationGoodsCl>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),
udiwmsBasicSkPrescribeRequest); udiwmsBasicSkPrescribeRequest);
if (page.getTotal() == 0){ if (page.getTotal() == 0) {
PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(null); pageSimpleResponse.setList(null);
@ -1846,13 +1846,13 @@ public class CtqyyClient extends CommonHttpClient {
if (basicProductsEntity != null) { if (basicProductsEntity != null) {
collectOrderBiz.setRelId(basicUdirelEntity.getId()); collectOrderBiz.setRelId(basicUdirelEntity.getId());
collectOrderBiz.setThrCode(basicUdirelEntity.getMainId()); collectOrderBiz.setThrCode(basicUdirelEntity.getMainId());
}else { } else {
errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";"); errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
} }
} else { } else {
errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";"); errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
} }
}else { } else {
errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";"); errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
} }
//==================================== //====================================
@ -1879,6 +1879,7 @@ public class CtqyyClient extends CommonHttpClient {
return ResultVOUtils.error(500, "下载失败!"); return ResultVOUtils.error(500, "下载失败!");
} }
} }
private BaseResponse covertReturnOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage<VYpzsPresInfoReturn> page) { private BaseResponse covertReturnOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage<VYpzsPresInfoReturn> page) {
List<VYpzsPresInfoReturn> presInfoEntities = page.getRecords(); List<VYpzsPresInfoReturn> presInfoEntities = page.getRecords();
List<VYpzsPresInfoReturn> vInsurNationGoodsReturns = new ArrayList<>(); List<VYpzsPresInfoReturn> vInsurNationGoodsReturns = new ArrayList<>();

16
src/main/resources/application-dev.yml
Unescape Escape View File

@ -5,7 +5,7 @@ spring:
strict: false strict: false
datasource: datasource:
master: master:
url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: Glxp@6066 password: Glxp@6066
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
@ -14,32 +14,32 @@ spring:
# username: SD_UDIJK # username: SD_UDIJK
# password: SD_UDIJK # password: SD_UDIJK
# driver-class-name: oracle.jdbc.driver.OracleDrive # driver-class-name: oracle.jdbc.driver.OracleDrive
url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: Glxp@6066 password: 123456
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
# thirdSql: # thirdSql:
# url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true # url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
# username: root # username: root
# password: Glxp@6066 # password: 123456
# driver-class-name: com.p6spy.engine.spy.P6SpyDriver # driver-class-name: com.p6spy.engine.spy.P6SpyDriver
ptxhSql: ptxhSql:
# jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
# username: SD_UDIJK # username: SD_UDIJK
# password: SD_UDIJK # password: SD_UDIJK
# driver-class-name: oracle.jdbc.driver.OracleDrive # driver-class-name: oracle.jdbc.driver.OracleDrive
url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: Glxp@6066 password: 123456
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
ctqyySql: ctqyySql:
# jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
# username: I_YPZS # username: I_YPZS
# password: zy02v4ys # password: zy02v4ys
# driver-class-name: oracle.jdbc.driver.OracleDrive # driver-class-name: oracle.jdbc.driver.OracleDrive
url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: Glxp@6066 password: 123456
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
hikari: hikari:
connection-timeout: 60000 connection-timeout: 60000

Write Preview
Loading…
Cancel
Save