From 1d9e7e986a0b4d0a21fa6f9f3cf22301c501b842 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 5 Dec 2025 13:06:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cgd/mapper/NuInvoicingCgdMainMapper.java | 2 + .../mapper/xml/NuInvoicingCgdMainMapper.xml | 6 ++ .../impl/NuInvoicingCgdMainServiceImpl.java | 5 +- .../qld/mapper/NuInvoicingQldMainMapper.java | 2 + .../mapper/xml/NuInvoicingQldMainMapper.xml | 9 +++ .../BlWarehouseMaterialInfoController.java | 8 +++ .../IBlWarehouseMaterialInfoService.java | 4 ++ .../BlWarehouseMaterialInfoServiceImpl.java | 64 +++++++++++++++++++ 8 files changed, 99 insertions(+), 1 deletion(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java index d6a8de8..dc247f5 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java @@ -23,4 +23,6 @@ public interface NuInvoicingCgdMainMapper extends BaseMapper List getCgrList(@Param("params") CgdMainEntity cgdMainEntityDto); IPage calcList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List selecCgdWlsfzytList(@Param("wlId") String wlId); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml index 885abf9..404c85c 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml @@ -19,4 +19,10 @@ AND crk.crk_type = 1 ${ew.customSqlSegment} + + 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 bf4ffcb..d1ff513 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 @@ -1081,7 +1081,10 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl0){ + crkInfoMapper.insert(crkInfo); + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldMainMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldMainMapper.java index 75ad2b3..05287f2 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldMainMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldMainMapper.java @@ -28,4 +28,6 @@ public interface NuInvoicingQldMainMapper extends BaseMapper IPage page(Page page, @Param("dto") InvoicingQldQueryEntity dto); List selectLogsByQldNos(@Param("qldNos") List qldNos); + + List selectQldWlsfzyList(@Param("wlId") String wlId); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml index ddf974e..ef0c7b5 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml @@ -103,4 +103,13 @@ ORDER BY log.create_time asc + + + + + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java index d6aff67..0372219 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java @@ -282,4 +282,12 @@ public class BlWarehouseMaterialInfoController extends JeecgController> queryWlsfzy(@RequestParam(name = "wlId", required = true) String wlId,@RequestParam(name = "nuId", required = true) String nuId) { + Map map = blWarehouseMaterialInfoService.queryWlsfzy(wlId, nuId); + return Result.OK(map); + } + + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/IBlWarehouseMaterialInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/IBlWarehouseMaterialInfoService.java index 7983f94..fc690a0 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/IBlWarehouseMaterialInfoService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/IBlWarehouseMaterialInfoService.java @@ -3,6 +3,8 @@ package com.nu.modules.warehouseMaterialInfo.service; import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Map; + /** * @Description: 库房物料配置信息 * @Author: jeecg-boot @@ -16,4 +18,6 @@ public interface IBlWarehouseMaterialInfoService extends IService queryWlsfzy(String wlId, String nuId); } 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 4a96eec..bdb920d 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 @@ -1,17 +1,30 @@ package com.nu.modules.warehouseMaterialInfo.service.impl; +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.qgd.entity.QgdInfo; +import com.nu.modules.qgd.mapper.QgdInfoMapper; +import com.nu.modules.qld.entity.NuInvoicingQldGwc; +import com.nu.modules.qld.entity.NuInvoicingQldMain; +import com.nu.modules.qld.mapper.NuInvoicingQldGwcMapper; +import com.nu.modules.qld.mapper.NuInvoicingQldMainMapper; import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo; import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper; import com.nu.modules.warehouseMaterialInfo.service.IBlWarehouseMaterialInfoService; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SpringContextUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description: 库房物料配置信息 @@ -22,6 +35,19 @@ import java.util.List; @Service public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl implements IBlWarehouseMaterialInfoService { + @Autowired + private QgdInfoMapper qgdInfoMapper; + + @Autowired + private NuInvoicingCgdMainMapper nuInvoicingCgdMainMapper; + + @Autowired + private NuInvoicingQldGwcMapper qldGwcMapper; + + @Autowired + private NuInvoicingQldMainMapper qldMainMapper; + + @Override public void addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -47,4 +73,42 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl queryWlsfzy(String wlId, String nuId) { + Map map = new HashMap<>(); + //查询采购单数据是否有占用的 + List cgdMainList = nuInvoicingCgdMainMapper.selecCgdWlsfzytList(wlId); + if(cgdMainList.size()>0){ + map.put("message","采购单数据有占用，请先清空占用信息后再停用"); + map.put("success",false); + return map; + } + //查询采购车的购物数据是否有 + List qgdInfoList = qgdInfoMapper.selectList(new QueryWrapper().eq("wl_id", wlId)); + if(qgdInfoList.size()>0){ + map.put("message","采购单购物车数据有占用，请先清空占用信息后再停用"); + map.put("success",false); + return map; + } + //查询请领单购物车是否有数据 + List qldGwcList = qldGwcMapper.selectList(new QueryWrapper().eq("wl_id", wlId)); + if(qldGwcList.size()>0){ + map.put("message","请领单购物车有占用，请先清空占用信息后再停用"); + map.put("success",false); + return map; + } + //查询请领单是否有占用的数据 + List qldMainList = qldMainMapper.selectQldWlsfzyList(wlId); + if(qldMainList.size()>0){ + map.put("message","请领单数据有占用，请先清空占用信息后再停用"); + map.put("success",false); + return map; + } + //TODO 查询盘点单是否有占用的数据 + + map.put("message","无占用"); + map.put("success",true); + return map; + } }