diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index c158b75af..bff0acbf8 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -84,6 +84,9 @@ public class IoCollectOriginController extends BaseController { getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()); getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords()); getSickPrescribeRequest.setPage(collectOrderRequest.getPage()); + getSickPrescribeRequest.setFromCorpName(collectOrderRequest.getFromCorpName()); + getSickPrescribeRequest.setShipperName(collectOrderRequest.getShipperName()); + BaseResponse> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest); return baseResponse; } else { @@ -98,6 +101,9 @@ public class IoCollectOriginController extends BaseController { filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime()); filterThrOrderRequest.setPage(collectOrderRequest.getPage()); filterThrOrderRequest.setKeyWords(collectOrderRequest.getKeyWords()); + + filterThrOrderRequest.setFromCorpName(collectOrderRequest.getFromCorpName()); + filterThrOrderRequest.setShipperName(collectOrderRequest.getShipperName()); BaseResponse> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest); return baseResponse; } diff --git a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java index 559aed630..7967b0680 100644 --- a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java @@ -29,4 +29,7 @@ public class GetSickPrescribeRequest extends ListPageRequest { * 来源业务 */ private String fromType; + + private String fromCorpName; + private String shipperName; } diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java index b75a802ca..45a1fa630 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java @@ -46,5 +46,7 @@ public class FilterThrOrderRequest extends ListPageRequest { private String startTime; private String endTime; + private String fromCorpName; + private String shipperName; private String keyWords;//模糊 单据号、三方单据类型、发货方、收货方、单据时间,来源系统 }