From 5c6b1d8fc5199819dce0fff475b8473fe898cc2c Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 26 Sep 2024 15:57:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=99=A8=E6=A2=B0=E5=A4=84=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/BaseHttpClient.java | 7 + .../glxp/mipsdl/client/CommonHttpClient.java | 14 ++ .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 134 ++++++++++++++++- .../mipsdl/controller/UdiWmsController.java | 11 ++ .../entity/ctqyy/VInsurNationGoodsCl.java | 137 ++++++++++++++++++ .../ctqyy/VInsurNationGoodsClMapper.java | 16 ++ .../other/ctqyy/VInsurNationGoodsClMapper.xml | 60 ++++++++ .../mapper/other/ctqyy/VYpzsIoInfoMapper.xml | 52 ++++++- .../other/ctqyy/VYpzsPlanInfoMapper.xml | 26 +++- .../other/ctqyy/VYpzsPresInfoMapper.xml | 13 +- .../other/ctqyy/VYpzsPresInfoReturnMapper.xml | 19 ++- 11 files changed, 473 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/glxp/mipsdl/entity/ctqyy/VInsurNationGoodsCl.java create mode 100644 src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VInsurNationGoodsClMapper.java create mode 100644 src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsClMapper.xml diff --git a/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java b/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java index f21663a..44f92cc 100644 --- a/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java @@ -287,4 +287,11 @@ public interface BaseHttpClient { * @return */ BaseResponse uploadCollectOrder(PostCollectOrderRequest postCollectOrderRequest); + + /** + * 获取器械处方单 + * @param udiwmsBasicSkPrescribeRequest + * @return + */ + BaseResponse getPrescribesQx(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); } diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java index 99045bf..f8867fb 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java @@ -315,6 +315,11 @@ public abstract class CommonHttpClient implements BaseHttpClient { return null; } + @Override + public BaseResponse getPrescribesQx(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { + return null; + } + @Resource private DataSource dataSource; @@ -328,6 +333,15 @@ public abstract class CommonHttpClient implements BaseHttpClient { databaseProductName = metaData.getDatabaseProductName();//MySQL //Oracle } catch (SQLException throwables) { throwables.printStackTrace(); + }finally { + // 释放连接资源 + if (conn != null) { + try { + conn.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } } return databaseProductName; 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 bf73786..9a5c161 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -124,6 +124,8 @@ public class CtqyyClient extends CommonHttpClient { @Resource private VYpzsPresInfoMapper vYpzsPresInfoMapper; @Resource + private VInsurNationGoodsClMapper vInsurNationGoodsClMapper; + @Resource private VYpzsPresInfoReturnMapper vYpzsPresInfoReturnMapper; @Resource private VYpzsPlanInfoMapper vYpzsPlanInfoMapper; @@ -1397,6 +1399,12 @@ public class CtqyyClient extends CommonHttpClient { IPage page = vYpzsPresInfoMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); + if (page.getTotal() == 0){ + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(page.getTotal()); + pageSimpleResponse.setList(null); + return ResultVOUtils.success(pageSimpleResponse); + } return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, page); } else { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -1423,6 +1431,12 @@ public class CtqyyClient extends CommonHttpClient { //拉取处方退货时，改成拉取v_ypzs_pres_info_return IPage page = vYpzsPresInfoReturnMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); + if (page.getTotal() == 0){ + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(page.getTotal()); + pageSimpleResponse.setList(null); + return ResultVOUtils.success(pageSimpleResponse); + } return this.covertReturnOrder(udiwmsBasicSkPrescribeRequest, page); } @@ -1643,6 +1657,41 @@ public class CtqyyClient extends CommonHttpClient { return ResultVOUtils.success(); } + @Override + public BaseResponse getPrescribesQx(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + String startTime = udiwmsBasicSkPrescribeRequest.getStartTime(); + String endTime = udiwmsBasicSkPrescribeRequest.getEndTime(); + wrapper.ge(StrUtil.isNotEmpty(startTime), VInsurNationGoodsCl::getSEL_RETN_TIME, startTime); + wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsCl::getSEL_RETN_TIME, endTime); + + String code = udiwmsBasicSkPrescribeRequest.getCode(); + String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName(); + String key = udiwmsBasicSkPrescribeRequest.getKey(); + wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsCl::getSTOOUT_NO, code).or().eq(VInsurNationGoodsCl::getRXNO, code)); + wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(VInsurNationGoodsCl::getSTOOUT_NO, key) + .or().like(VInsurNationGoodsCl::getRXNO, key) + .or().like(VInsurNationGoodsCl::getPSN_NAME, key) + .or().like(VInsurNationGoodsCl::getPSN_NO, key) + ); + wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsCl::getPSN_NAME, fromCorpName)); + + udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType()); + + // 拉取处方时，改成拉取v_ypzs_pres_info + IPage page = vInsurNationGoodsClMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), + udiwmsBasicSkPrescribeRequest); + + if (page.getTotal() == 0){ + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(page.getTotal()); + pageSimpleResponse.setList(null); + return ResultVOUtils.success(pageSimpleResponse); + } + return this.covertSellOrderQx(udiwmsBasicSkPrescribeRequest, page); + } + // 辅助方法，用于检查busType是否存在于指定的buyType数组中 private static boolean matchBusType(String busType, String[] buyTypes) { for (String buyType : buyTypes) { @@ -1697,9 +1746,8 @@ public class CtqyyClient extends CommonHttpClient { List bizList = new ArrayList<>(); value.forEach(entity -> { IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); - List basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE())); - if (CollUtil.isNotEmpty(basicUdirelEntities)) { - BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0); + BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()).last(" limit 1")); + if (basicUdirelEntity != null) { collectOrderBiz.setRelId(basicUdirelEntity.getId()); } else { errorMsg.append(entity.getPHYSIC_NAME()).append("字典未对照").append(";"); @@ -1740,6 +1788,84 @@ public class CtqyyClient extends CommonHttpClient { } } + /** + * 单据 + * + * @param udiwmsBasicSkPrescribeRequest + * @return + */ + private BaseResponse covertSellOrderQx(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { + List presInfoEntities = page.getRecords(); + List vInsurNationGoodsPhysics = new ArrayList<>(); + if (CollUtil.isNotEmpty(presInfoEntities)) { + List collect = presInfoEntities.stream().map(VInsurNationGoodsCl::getSTOOUT_NO).collect(Collectors.toList()); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.in(VInsurNationGoodsCl::getSTOOUT_NO, collect); + vInsurNationGoodsPhysics = vInsurNationGoodsClMapper.selectList(wrapper1); + } + + // TODO: 2024/9/19 这边在转换的时候就不能用VInsurNationGoodsPhysic + if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) { + Map> groupedByPrescribeNumber = vInsurNationGoodsPhysics.stream() + .collect(Collectors.groupingBy(VInsurNationGoodsCl::getSTOOUT_NO)); + List ioCollectOrders = new ArrayList<>(); + groupedByPrescribeNumber.forEach((key, value) -> { + VInsurNationGoodsCl presInfoEntity = value.get(0); + StringBuilder errorMsg = new StringBuilder(); + IoCollectOrder ioCollectOrder = new IoCollectOrder(); + ioCollectOrder.setBillNo(presInfoEntity.getSTOOUT_NO()); + ioCollectOrder.setFromType("HIS系统"); + ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID()); + ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()); + ioCollectOrder.setFromCorpName(presInfoEntity.getPSN_NAME()); + Date date = DateUtil.parseDate(presInfoEntity.getSEL_RETN_TIME()); + ioCollectOrder.setBillTime(date); + 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); + List bizList = new ArrayList<>(); + value.forEach(entity -> { + IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); + BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getFIXMEDINS_HILIST_ID()).last(" limit 1")); + if (basicUdirelEntity != null) { + collectOrderBiz.setRelId(basicUdirelEntity.getId()); + } else { + errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";"); + } +//==================================== +// collectOrderBiz.setGgxh(entity.getPACK_SPEC()); +// collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT()); +// collectOrderBiz.setCount(IntUtil.value(entity.getLAY_PHYSIC_QUANTITY())); +// collectOrderBiz.setThrCode(entity.getPHYSIC_CODE()); +// collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME()); +// collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); +// collectOrderBiz.setYbbm(entity.getCOUNTRY_CODE()); +//==================================== + collectOrderBiz.setTagStatus(1); + collectOrderBiz.setUnTagCount(0); + bizList.add(collectOrderBiz); + }); + if (StrUtil.isNotBlank(errorMsg)) { + ioCollectOrder.setErrorMsg(errorMsg.toString()); + ioCollectOrder.setTagStatus(4); + } + ioCollectOrder.setBizList(bizList); + ioCollectOrders.add(ioCollectOrder); + }); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(page.getTotal()); + pageSimpleResponse.setList(ioCollectOrders); + return ResultVOUtils.success(pageSimpleResponse); + } else { + return ResultVOUtils.error(500, "下载失败!"); + } + } private BaseResponse covertReturnOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { List presInfoEntities = page.getRecords(); List vInsurNationGoodsReturns = new ArrayList<>(); @@ -1773,7 +1899,7 @@ public class CtqyyClient extends CommonHttpClient { List bizList = new ArrayList<>(); value.forEach(entity -> { IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); - BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE())); + BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()).last(" limit 1")); if (basicUdirelEntity != null) { collectOrderBiz.setRelId(basicUdirelEntity.getId()); } else { diff --git a/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java b/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java index 32285b4..cba689b 100644 --- a/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java +++ b/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java @@ -323,6 +323,17 @@ public class UdiWmsController { return ClientProcessor.getHttpClient().getPrescribes(udiwmsBasicSkPrescribeRequest); } + /** + * 器械处方 + * + * @param udiwmsBasicSkPrescribeRequest + * @return + */ + @PostMapping("/udiwms/erp/getPrescribesQx") + public BaseResponse getPrescribesQx(@RequestBody UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { + return ClientProcessor.getHttpClient().getPrescribesQx(udiwmsBasicSkPrescribeRequest); + } + /** * 采购计划入库 * diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VInsurNationGoodsCl.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VInsurNationGoodsCl.java new file mode 100644 index 0000000..3be473d --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VInsurNationGoodsCl.java @@ -0,0 +1,137 @@ +package com.glxp.mipsdl.entity.ctqyy; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName(value = "v_insur_nation_goods_cl") +public class VInsurNationGoodsCl implements Serializable { + + @TableField(value = "MED_LIST_CODG") + private String MED_LIST_CODG; + + @TableField(value = "FIXMEDINS_HILIST_ID") + private String FIXMEDINS_HILIST_ID; + + @TableField(value = "FIXMEDINS_HILIST_NAME") + private String FIXMEDINS_HILIST_NAME; + + @TableField(value = "FIXMEDINS_BCHNO") + private Integer FIXMEDINS_BCHNO; + + @TableField(value = "PRSC_DR_CERT_TYPE") + private String PRSC_DR_CERT_TYPE; + + @TableField(value = "PRSC_DR_CERTNO") + private String PRSC_DR_CERTNO; + + @TableField(value = "PRSC_DR_NAME") + private String PRSC_DR_NAME; + + @TableField(value = "PHAR_CERT_TYPE") + private String PHAR_CERT_TYPE; + + @TableField(value = "PHAR_CERTNO") + private String PHAR_CERTNO; + + @TableField(value = "PHAR_NAME") + private String PHAR_NAME; + + @TableField(value = "PHAR_PRAC_CERT_NO") + private String PHAR_PRAC_CERT_NO; + + @TableField(value = "HI_FEESETL_TYPE") + private Integer HI_FEESETL_TYPE; + + @TableField(value = "SETL_ID") + private String SETL_ID; + + @TableField(value = "MDTRT_SN") + private String MDTRT_SN; + + @TableField(value = "PSN_NO") + private String PSN_NO; + + @TableField(value = "PSN_CERT_TYPE") + private String PSN_CERT_TYPE; + + @TableField(value = "CERTNO") + private String CERTNO; + + @TableField(value = "PSN_NAME") + private String PSN_NAME; + + @TableField(value = "MANU_LOTNUM") + private String MANU_LOTNUM; + + @TableField(value = "MANU_DATE") + private String MANU_DATE; + + @TableField(value = "EXPY_END") + private String EXPY_END; + + @TableField(value = "RX_FLAG") + private Integer RX_FLAG; + + @TableField(value = "TRDN_FLAG") + private Integer TRDN_FLAG; + + @TableField(value = "FINL_TRNS_PRIC") + private BigDecimal FINL_TRNS_PRIC; + + @TableField(value = "RXNO") + private Integer RXNO; + + @TableField(value = "RX_CIRC_FLAG") + private Integer RX_CIRC_FLAG; + + @TableField(value = "RTAL_DOCNO") + private String RTAL_DOCNO; + + @TableField(value = "STOOUT_NO") + private String STOOUT_NO; + + @TableField(value = "BCHNO") + private Integer BCHNO; + + @TableField(value = "RUG_PROD_BARC") + private String RUG_PROD_BARC; + + @TableField(value = "SHELF_POSI") + private String SHELF_POSI; + + @TableField(value = "SEL_RETN_CNT") + private Integer SEL_RETN_CNT; + + @TableField(value = "SEL_RETN_TIME") + private String SEL_RETN_TIME; + + @TableField(value = "SEL_RETN_OPTER_NAME") + private String SEL_RETN_OPTER_NAME; + + @TableField(value = "MEMO") + private String MEMO; + + @TableField(value = "MDTRT_SETL_TYPE") + private Integer MDTRT_SETL_TYPE; + + @TableField(value = "DRUGTRACINFO") + private String DRUGTRACINFO; + + @TableField(value = "APPLY_NO") + private String APPLY_NO; + + @TableField(value = "SETTLE_NO") + private String SETTLE_NO; + + @TableField(value = "SICK_ID") + private String SICK_ID; + + + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VInsurNationGoodsClMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VInsurNationGoodsClMapper.java new file mode 100644 index 0000000..fbd8c6c --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VInsurNationGoodsClMapper.java @@ -0,0 +1,16 @@ +package com.glxp.mipsdl.thirddao.ctqyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsCl; +import com.glxp.mipsdl.req.base.UdiwmsBasicSkPrescribeRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +@DS("ctqyySql") +public interface VInsurNationGoodsClMapper extends BaseMapper { + IPage selectGroupedWithPagination(Page page, @Param("udiwmsBasicSkPrescribeRequest") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); +} \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsClMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsClMapper.xml new file mode 100644 index 0000000..ad53ca7 --- /dev/null +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsClMapper.xml @@ -0,0 +1,60 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml index 2fc8306..7253d77 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml @@ -62,23 +62,29 @@ and KEEP_BOOK_TIME <= #{udiwmsThrOrderRequest.endTime} ]]> - + and (CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.corpName} || '%' or CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.corpName} || '%') - + and RECEIPT_NUMBER = #{udiwmsThrOrderRequest.billNo} - + and CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.fromCorpName} || '%' - + and CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.shipperName} || '%' - + and IO_SORT = #{udiwmsThrOrderRequest.busType} - + and ( CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%' or CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%' @@ -86,6 +92,40 @@ or RECEIPT_NUMBER = #{udiwmsThrOrderRequest.keyWords} or IO_SORT = #{udiwmsThrOrderRequest.keyWords}) + + + + + + and (CONSIGNOR_NAME LIKE concat('%', #{udiwmsThrOrderRequest.corpName}, '%') + or CONSIGNEE_NAME LIKE concat('%', #{udiwmsThrOrderRequest.corpName}, '%')) + + + and RECEIPT_NUMBER = #{udiwmsThrOrderRequest.billNo} + + + and CONSIGNEE_NAME LIKE concat('%', #{udiwmsThrOrderRequest.fromCorpName}, '%') + + + and CONSIGNOR_NAME LIKE concat('%', #{udiwmsThrOrderRequest.shipperName}, '%') + + + and IO_SORT = #{udiwmsThrOrderRequest.busType} + + + and ( + CONSIGNOR_NAME LIKE concat('%', #{udiwmsThrOrderRequest.keyWords}, '%') + or CONSIGNEE_NAME LIKE concat('%', #{udiwmsThrOrderRequest.keyWords}, '%') + or PHYSIC_CODE LIKE concat('%', #{udiwmsThrOrderRequest.keyWords}, '%') + or RECEIPT_NUMBER LIKE concat('%', #{udiwmsThrOrderRequest.keyWords}, '%') + ) + GROUP BY RECEIPT_NUMBER ORDER BY RECEIPT_NUMBER diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml index d3d490f..364b45e 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml @@ -5,18 +5,38 @@ SELECT CGDBH FROM V_YPZS_PLAN_INFO - + and ( CGDBH like '%' || #{udiwmsThrOrderRequest.billNo} || '%' ) - + and (CGDBH like '%' || #{udiwmsThrOrderRequest.keyWords} || '%' ) - + and (SCQYMC like '%' || #{udiwmsThrOrderRequest.fromCorpName} || '%' ) + + + + and ( CGDBH like concat('%', #{udiwmsThrOrderRequest.billNo}, '%')) + + + + and (CGDBH like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%')) + ) + + + and (SCQYMC like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%')) + ) + GROUP BY CGDBH ORDER BY CGDBH diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml index b83d64d..91a4e0b 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml @@ -65,11 +65,22 @@ and ( STOOUT_NO = #{udiwmsBasicSkPrescribeRequest.code} or PHYSIC_CODE = #{udiwmsBasicSkPrescribeRequest.code} + or PRESCRIBE_NUMBER = #{udiwmsBasicSkPrescribeRequest.code} ) - + + and (STOOUT_NO like '%' || #{udiwmsBasicSkPrescribeRequest.key} || '%' or PHYSIC_CODE like '%' || #{udiwmsBasicSkPrescribeRequest.key} || '%' + or PRESCRIBE_NUMBER like '%' || #{udiwmsBasicSkPrescribeRequest.key} || '%' + ) + + + and (STOOUT_NO like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%') + or PHYSIC_CODE like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%') + or PRESCRIBE_NUMBER like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%') ) diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml index d31732f..52e82a3 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml @@ -66,16 +66,31 @@ and (APPLY_NO = #{udiwmsBasicSkPrescribeRequest.code}) - + and (PSN_NAME like '%' || #{udiwmsBasicSkPrescribeRequest.fromCorpName} || '%' ) - + and (APPLY_NO like '%' || #{udiwmsBasicSkPrescribeRequest.key} || '%' or PSN_NAME like '%' ||#{udiwmsBasicSkPrescribeRequest.key} || '%' or PSN_NO like '%' || #{udiwmsBasicSkPrescribeRequest.key} ||'%' ) + + + and (PSN_NAME like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%') + + + + and (APPLY_NO like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%') + or PSN_NAME like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%') + or PSN_NO like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%') + ) + GROUP BY APPLY_NO