|
|
|
@ -1401,8 +1401,8 @@ public class ScpwxyyClient extends CommonHttpClient {
|
|
|
|
|
|
|
|
|
|
String startTime = udiwmsBasicSkPrescribeRequest.getStartTime();
|
|
|
|
|
String endTime = udiwmsBasicSkPrescribeRequest.getEndTime();
|
|
|
|
|
wrapper.ge(StrUtil.isNotEmpty(startTime), A010head::getPrescribedate, startTime);
|
|
|
|
|
wrapper.le(StrUtil.isNotEmpty(endTime), A010head::getPrescribedate, endTime);
|
|
|
|
|
wrapper.ge(StrUtil.isNotEmpty(startTime), A010head::getPrescribedate, DateUtil.parseDate(startTime));
|
|
|
|
|
wrapper.le(StrUtil.isNotEmpty(endTime), A010head::getPrescribedate, DateUtil.parseDate(endTime));
|
|
|
|
|
|
|
|
|
|
String code = udiwmsBasicSkPrescribeRequest.getCode();
|
|
|
|
|
String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName();
|
|
|
|
@ -1428,8 +1428,8 @@ public class ScpwxyyClient extends CommonHttpClient {
|
|
|
|
|
|
|
|
|
|
String startTime = udiwmsBasicSkPrescribeRequest.getStartTime();
|
|
|
|
|
String endTime = udiwmsBasicSkPrescribeRequest.getEndTime();
|
|
|
|
|
wrapper.ge(StrUtil.isNotEmpty(startTime), A011head::getPrescribedate, startTime);
|
|
|
|
|
wrapper.le(StrUtil.isNotEmpty(endTime), A011head::getPrescribedate, endTime);
|
|
|
|
|
wrapper.ge(StrUtil.isNotEmpty(startTime), A011head::getPrescribedate, DateUtil.parseDate(startTime));
|
|
|
|
|
wrapper.le(StrUtil.isNotEmpty(endTime), A011head::getPrescribedate, DateUtil.parseDate(endTime));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String code = udiwmsBasicSkPrescribeRequest.getCode();
|
|
|
|
@ -1542,8 +1542,9 @@ public class ScpwxyyClient extends CommonHttpClient {
|
|
|
|
|
|
|
|
|
|
String startTime = udiwmsThrOrderRequest.getStartTime();
|
|
|
|
|
String endTime = udiwmsThrOrderRequest.getEndTime();
|
|
|
|
|
wrapper.ge(StrUtil.isNotEmpty(startTime), VYpzsIoInfo::getKEEP_BOOK_TIME, startTime);
|
|
|
|
|
wrapper.le(StrUtil.isNotEmpty(endTime), VYpzsIoInfo::getKEEP_BOOK_TIME, endTime);
|
|
|
|
|
wrapper.ge(StrUtil.isNotEmpty(startTime), VYpzsIoInfo::getKEEP_BOOK_TIME, DateUtil.parseDate(startTime));
|
|
|
|
|
wrapper.le(StrUtil.isNotEmpty(endTime), VYpzsIoInfo::getKEEP_BOOK_TIME, DateUtil.parseDate(endTime));
|
|
|
|
|
|
|
|
|
|
wrapper.and(StrUtil.isNotEmpty(udiwmsThrOrderRequest.getCorpName()), t -> t.like(VYpzsIoInfo::getCONSIGNEE_NAME, udiwmsThrOrderRequest.getCorpName()).or().eq(VYpzsIoInfo::getCONSIGNOR_NAME, udiwmsThrOrderRequest.getCorpName()));
|
|
|
|
|
|
|
|
|
|
wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsIoInfo::getPHYSIC_CODE, udiwmsThrOrderRequest.getBillNo());
|
|
|
|
|