diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java index 8481367..d8c6ca6 100644 --- a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java @@ -1318,7 +1318,12 @@ public class YxfyyyClient extends CommonHttpClient { public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - // TODO: 2024/9/13 缺少查询条件 + + 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"); + String code = udiwmsBasicSkPrescribeRequest.getCode(); wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, code).or().eq(VInsurNationGoodsPhysic::getRXNO, code)); IPage page = goodsPhysicMapper @@ -1347,7 +1352,12 @@ public class YxfyyyClient extends CommonHttpClient { PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); if (udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.CGJH001.getBusType())) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - //补充其他查询条件 todo + +// String startTime = udiwmsThrOrderRequest.getStartTime(); +// String endTime = udiwmsThrOrderRequest.getEndTime(); +// wrapper.ge(StrUtil.isNotEmpty(startTime),VYpzsPlanInfo::getKEEP_BOOK_TIME,startTime+" 00:00:00"); +// wrapper.le(StrUtil.isNotEmpty(endTime),VYpzsPlanInfo::getKEEP_BOOK_TIME,endTime+" 23:59:59"); + wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsPlanInfo::getCGDBH, udiwmsThrOrderRequest.getBillNo()); IPage page = vYpzsPlanInfoMapper.selectPage(new Page(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper); List planInfos = page.getRecords(); @@ -1399,7 +1409,12 @@ public class YxfyyyClient extends CommonHttpClient { pageSimpleResponse.setList(ioCollectOrders); } else { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - //补充其他查询条件 todo + + 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.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsIoInfo::getPHYSIC_CODE, udiwmsThrOrderRequest.getBillNo()); wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getIO_SORT, udiwmsThrOrderRequest.getBusType()); Page page = vYpzsIoInfoMapper.selectPage(new Page(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper); diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPlanInfo.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPlanInfo.java index 8e2e08c..f5dc693 100644 --- a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPlanInfo.java +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPlanInfo.java @@ -69,4 +69,8 @@ public class VYpzsPlanInfo { private BigDecimal TPJG; +// @TableField(value = "KEEP_BOOK_TIME") +// private String KEEP_BOOK_TIME; + + } diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java index 8af5eca..da8ddb9 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java @@ -195,5 +195,8 @@ public class UdiwmsThrOrderRequest extends ListPageRequest { private String busType; private Long workPlaceCode; + + private String startTime; + private String endTime; }