From 2ce148ee9be469a9dc94f429a22fd9fb566ba7ec Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 11 Dec 2025 15:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=98=AF=E5=90=A6=E6=9C=89=E7=9B=98=E7=82=B9=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=8D=95=E6=8D=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pad/invoicing/api/InvoicingPddApi.java | 7 +++++++ .../java/com/nu/modules/invoicing/api/IPddApi.java | 2 ++ .../pdd/mapper/NuInvoicingPddMainMapper.java | 1 + .../pdd/mapper/xml/NuInvoicingPddMainMapper.xml | 5 +++++ .../impl/NuInvoicingPddMainServiceImpl.java | 14 ++++++++++++++ .../impl/BlWarehouseMaterialInfoServiceImpl.java | 13 ++++++++++++- 6 files changed, 41 insertions(+), 1 deletion(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingPddApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingPddApi.java index 10039ce1..3fdb783d 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingPddApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingPddApi.java @@ -129,4 +129,11 @@ public class InvoicingPddApi { return Result.error(result.get("message").toString()); } } + + @ApiOperation(value = "盘点单-查询是否有盘点中的单据", notes = "盘点单-查询是否有盘点中的单据") + @GetMapping(value = "/queryPddStartInfo") + public Result> queryPddStartInfo(InvoicingPddInfoEntity invoicingPddInfoEntity) { + Map pageList = pddApi.queryPddStartInfo(invoicingPddInfoEntity); + return Result.OK(pageList); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IPddApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IPddApi.java index 5c56e784..2f3c271a 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IPddApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IPddApi.java @@ -22,4 +22,6 @@ public interface IPddApi { List> queryPddStartByList(InvoicingPddInfoEntity invoicingPddInfoEntity); Map voidedPddMain(InvoicingPddMainEntity invoicingPddMainEntity); + + Map queryPddStartInfo(InvoicingPddInfoEntity invoicingPddInfoEntity); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddMainMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddMainMapper.java index 89538b97..4d83bd0b 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddMainMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddMainMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface NuInvoicingPddMainMapper extends BaseMapper { + List selectPddWlsfzyList(@Param("wlId") String wlId); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddMainMapper.xml index ef24e3ff..2a4b98c7 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddMainMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddMainMapper.xml @@ -2,4 +2,9 @@ + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java index a2997176..e9cc5cfc 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java @@ -334,4 +334,18 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl queryPddStartInfo(InvoicingPddInfoEntity invoicingPddInfoEntity) { + List list = baseMapper.selectList(new QueryWrapper().eq("pdd_type","1")); + Map map = new HashMap<>(); + if(list.size()>0){ + map.put("success","false"); + map.put("message","有盘点单正在盘点中，请稍后尝试操作！"); + return map; + } + map.put("success","true"); + map.put("message","操作成功"); + return map; + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java index 5ca8209c..54b9c5c3 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nu.entity.QgdInfoEntity; import com.nu.modules.cgd.entity.NuInvoicingCgdMain; import com.nu.modules.cgd.mapper.NuInvoicingCgdMainMapper; +import com.nu.modules.pdd.entity.NuInvoicingPddMain; +import com.nu.modules.pdd.mapper.NuInvoicingPddMainMapper; import com.nu.modules.qgd.entity.QgdInfo; import com.nu.modules.qgd.mapper.QgdInfoMapper; import com.nu.modules.qld.entity.NuInvoicingQldGwc; @@ -47,6 +49,9 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl pddMainList = pddMainMapper.selectPddWlsfzyList(wlId); + if(pddMainList.size()>0){ + map.put("message","有仓库正在盘点单中，等盘点结束后再进行操作"); + map.put("success",false); + return map; + } map.put("message","无占用"); map.put("success",true);