From b819c661b4e29ee8eab8ef9a9b234bc536ded0d2 Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 13 Sep 2024 17:34:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E6=B7=BB=E5=8A=A0=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 16 ++++++++++++++++ .../req/base/UdiwmsBasicSkPrescribeRequest.java | 2 ++ 2 files changed, 18 insertions(+) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 500d190..036a288 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1381,13 +1381,25 @@ public class CtqyyClient extends CommonHttpClient { wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, endTime + " 23:59:59"); String code = udiwmsBasicSkPrescribeRequest.getCode(); + String key = udiwmsBasicSkPrescribeRequest.getKey(); wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, code).or().eq(VInsurNationGoodsPhysic::getRXNO, code)); + wrapper.and(StrUtil.isNotEmpty(key), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, key) + .or().eq(VInsurNationGoodsPhysic::getRXNO, key) + .or().eq(VInsurNationGoodsPhysic::getPSN_NAME, key) + .or().eq(VInsurNationGoodsPhysic::getPSN_NO, key) + ); + IPage page = goodsPhysicMapper .selectPage(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), wrapper); return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, page); } else { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); String code = udiwmsBasicSkPrescribeRequest.getCode(); + String key = udiwmsBasicSkPrescribeRequest.getKey(); + wrapper.and(StrUtil.isNotEmpty(key), t -> t.eq(VInsurNationGoodsReturn::getAPPLY_NO, key) + .or().eq(VInsurNationGoodsReturn::getPSN_NAME, key) + .or().eq(VInsurNationGoodsReturn::getPSN_NO, key) + ); wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsReturn::getAPPLY_NO, code)); IPage page = vInsurNationGoodsReturnMapper .selectPage(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), wrapper); @@ -1470,6 +1482,7 @@ public class CtqyyClient extends CommonHttpClient { 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.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()); wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getIO_SORT, udiwmsThrOrderRequest.getBusType()); @@ -1608,6 +1621,9 @@ public class CtqyyClient extends CommonHttpClient { ioCollectOrder.setCreateTime(new Date()); ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser()); ioCollectOrder.setBackupOrderRemark1(presInfoEntity.getSTOOUT_NO()); + ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID()); + ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME()); + ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO()); ioCollectOrder.setUpdateTime(new Date()); ioCollectOrder.setSplitStatus(0); ioCollectOrder.setTagStatus(0); diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java index e51de85..07d842f 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java @@ -126,5 +126,7 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest { private String startTime; private String endTime; + + private String key; }