|
|
|
@ -1377,8 +1377,8 @@ public class CtqyyClient extends CommonHttpClient {
|
|
|
|
|
|
|
|
|
|
String startTime = udiwmsBasicSkPrescribeRequest.getStartTime();
|
|
|
|
|
String endTime = udiwmsBasicSkPrescribeRequest.getEndTime();
|
|
|
|
|
wrapper.ge(StrUtil.isNotEmpty(startTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, startTime + " 00:00:00");
|
|
|
|
|
wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, endTime + " 23:59:59");
|
|
|
|
|
wrapper.ge(StrUtil.isNotEmpty(startTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, startTime);
|
|
|
|
|
wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, endTime);
|
|
|
|
|
|
|
|
|
|
String code = udiwmsBasicSkPrescribeRequest.getCode();
|
|
|
|
|
String key = udiwmsBasicSkPrescribeRequest.getKey();
|
|
|
|
@ -1480,8 +1480,8 @@ public class CtqyyClient extends CommonHttpClient {
|
|
|
|
|
|
|
|
|
|
String startTime = udiwmsThrOrderRequest.getStartTime();
|
|
|
|
|
String endTime = udiwmsThrOrderRequest.getEndTime();
|
|
|
|
|
wrapper.ge(StrUtil.isNotEmpty(startTime), VYpzsIoInfo::getKEEP_BOOK_TIME, startTime + " 00:00:00");
|
|
|
|
|
wrapper.le(StrUtil.isNotEmpty(endTime), VYpzsIoInfo::getKEEP_BOOK_TIME, endTime + " 23:59:59");
|
|
|
|
|
wrapper.ge(StrUtil.isNotEmpty(startTime), VYpzsIoInfo::getKEEP_BOOK_TIME, startTime);
|
|
|
|
|
wrapper.le(StrUtil.isNotEmpty(endTime), VYpzsIoInfo::getKEEP_BOOK_TIME, 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());
|
|
|
|
|