From 45830f8f16930aca301c3f6137ce4d58f121121d Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 23 Oct 2025 10:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingApi.java | 7 +++-- .../org/jeecg/config/shiro/ShiroConfig.java | 2 +- .../java/com/nu/entity/CgdMainEntity.java | 2 ++ .../modules/invoicing/api/IInvoicingApi.java | 2 +- .../impl/NuInvoicingCgdMainServiceImpl.java | 30 ++++++++++++++----- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index bdbe4f27..bd1d6bb7 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -49,7 +49,10 @@ public class InvoicingApi { @AutoLog(value = "请购单-请购信息-添加") @PostMapping(value = "/addShoppingCartList") public Result addShoppingCartList(@RequestBody List infoList) { - invoicingApi.addShoppingCartList(infoList); + String result = invoicingApi.addShoppingCartList(infoList); + if("1".equals( result)){ + return Result.error("请购信息已存在，不可重复请购！"); + } return Result.OK("添加成功！"); } @@ -65,7 +68,7 @@ public class InvoicingApi { @PostMapping(value = "/generatedPurchaseOrder") public Result> generatedPurchaserder(@RequestBody List cgdMainList, HttpServletRequest req) { List list = invoicingApi.generatedPurchaserder(cgdMainList); - return Result.OK(list); + return Result.OK("操作成功"); } @ApiOperation(value = "查询采购单列表信息", notes = "查询采购单列表信息") diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index f2c871ab..4da2e559 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -90,7 +90,7 @@ public class ShiroConfig { } filterChainDefinitionMap.put("/api/tplink/videoStorage/**", "anon"); //视频缓存存储接口 - filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口 +// filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口 filterChainDefinitionMap.put("/iot/tq/api/electricityMeter/**", "anon"); //电表回调 filterChainDefinitionMap.put("/api/pad/baseInfo/**", "anon"); //电表回调 filterChainDefinitionMap.put("/iot/tq/api/waterMeter/**", "anon"); //水表回调 diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java index 0325bf53..37c61454 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java @@ -69,6 +69,8 @@ public class CgdMainEntity implements Serializable { private String jzdPath; /**审核人*/ private String reviewedBy; + /**审核人*/ + private String gysName; // 总价 private BigDecimal totalPrice; /**审核时间*/ diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index 077695e5..0c5a4f5e 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -13,7 +13,7 @@ public interface IInvoicingApi { IPage queryShoppingCartList(Integer pageNo, Integer pageSize, QgdInfoEntity qgdInfoEntityDto, HttpServletRequest req); - void addShoppingCartList(List infoList); + String addShoppingCartList(List infoList); List generatedPurchaseViewOrder(List infoList); 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 acfb3855..006ff971 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 @@ -200,10 +200,16 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl infoList) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + public String addShoppingCartList(List infoList) { + String result = "0"; for (QgdInfoEntity info : infoList) { if(info.getPurchaseQuantity()!=null && info.getPurchaseQuantity()>0){ + //查询是否有请购信息 + QgdInfo qgdInfo = qgdInfoMapper.selectOne(new QueryWrapper().eq("wl_id",info.getWlId()).eq("nu_id",info.getNuId())); + if(qgdInfo!=null){ + result = "1"; + break; + } //获取物料基础信息 ConfigMaterialInfo ConfigMaterialInfo = configMaterialInfoMapper.selectById(info.getWlId()); info.setWlName(ConfigMaterialInfo.getMaterialName()); @@ -219,11 +225,12 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl-1){ + for(String param : id.split(",")){ + qgdInfoMapper.deleteById(param); + } + }else{ + qgdInfoMapper.deleteById(id); + } } @Override