From 9ca0b0a2107eb091e8aca5c1bbc285d76400aaf6 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 5 Dec 2025 14:25:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/NuInvoicingCgdMainServiceImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index a5d0b23..849b028 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -1128,21 +1128,23 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl cgdInfoList = cgdInfoMapper.selectList(new QueryWrapper().eq("cgd_id",cgdInfo.getCgdId())); - int count = 0; + int count = 1; /**单据状态 0待入库 1挂账中 2已入库 3已销账*/ for (NuInvoicingCgdInfo info : cgdInfoList) { - //判断采购物料状态 - if(StringUtils.equals("2",info.getStatus())){ - count++; - }else if((StringUtils.equals("3",info.getStatus()) || StringUtils.equals("2",info.getStatus()) && wrksl==0)){ - count++; - }else if(StringUtils.equals("0",info.getStatus())){ + if(StringUtils.equals("0",info.getStatus())){ + count = 0; + break; + }else if(StringUtils.equals("1",info.getStatus())){ + count = 0; + break; + }else if(StringUtils.equals("3",info.getStatus()) && info.getWrksl()>0){ + count = 0; break; } } //判断单据是否完结 如果采购数量 = 入库数量 + 销账数量 就代表这个单据完结了 - if(count == cgdInfoList.size()){ + if(count == 1){ cgdMain.setWjBy(loginUser.getRealname()); cgdMain.setWjTime(new Date()); cgdMain.setStatus("2");//已完结