From 6b9efa9b1ea893fd52452b085c0cc2981eb24028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 19 May 2022 20:08:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=A0=E9=99=A4=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=8E=9F=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=E4=B8=8D=E5=8F=98?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/service/depotHead/DepotHeadService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 23d66e23..aa2a25c7 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -314,7 +314,7 @@ public class DepotHeadService { BusinessConstants.SUB_TYPE_REPLAY.equals(depotHead.getSubType()))) { String status = BusinessConstants.BILLS_STATUS_AUDIT; //查询除当前单据之外的关联单据列表 - List exceptCurrentList = getListByLinkNumberExceptCurrent(depotHead.getLinkNumber(), depotHead.getNumber()); + List exceptCurrentList = getListByLinkNumberExceptCurrent(depotHead.getLinkNumber(), depotHead.getNumber(), depotHead.getType()); if(exceptCurrentList!=null && exceptCurrentList.size()>0) { status = BusinessConstants.BILLS_STATUS_SKIPING; } @@ -691,9 +691,9 @@ public class DepotHeadService { * @return * @throws Exception */ - public List getListByLinkNumberExceptCurrent(String linkNumber, String number)throws Exception { + public List getListByLinkNumberExceptCurrent(String linkNumber, String number, String type)throws Exception { DepotHeadExample example = new DepotHeadExample(); - example.createCriteria().andLinkNumberEqualTo(linkNumber).andNumberNotEqualTo(number) + example.createCriteria().andLinkNumberEqualTo(linkNumber).andNumberNotEqualTo(number).andTypeEqualTo(type) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return depotHeadMapper.selectByExample(example); }