From cbef3ddb05d0293a4f522a2d3f553c696e1c6880 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 17 Nov 2025 10:45:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=B9=E4=BB=B7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingApi.java | 14 ++++ .../java/com/nu/entity/CgdMainEntity.java | 18 ++++ .../modules/invoicing/api/IInvoicingApi.java | 2 + .../impl/NuInvoicingCgdMainServiceImpl.java | 82 ++++--------------- 4 files changed, 49 insertions(+), 67 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 5a06dfd..db81c19 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 @@ -329,4 +329,18 @@ public class InvoicingApi { return Result.OK("操作成功！"); } + + @ApiOperation(value="请购单改价", notes="请购单改价") + @AutoLog(value = "请购单改价") + @PostMapping(value = "/editPrice") + public Result editPrice(@RequestBody CgdInfoEntity cgdInfoEntityDto) { + String result = invoicingApi.editPrice(cgdInfoEntityDto); +// if(StringUtils.equals("2",result)){ +// return Result.error("入库数量错误，超过请购数量"); +// }else if(StringUtils.equals("3",result)){ +// return Result.error("销账数量错误，超过请购数量"); +// } + return Result.OK("操作成功！"); + } + } 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 30e327a..714f3ef 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 @@ -1,6 +1,7 @@ package com.nu.entity; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecg.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; @@ -86,4 +87,21 @@ public class CgdMainEntity implements Serializable { private String startTime; private String endTime; private String cgBy; + + /**拣货人*/ + private String jhBy; + + /**拣货时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "审核时间") + private Date jhTime; + /**完结人*/ + private String wjBy; + + /**完结时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "审核时间") + private Date wjTime; } 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 79b0dda..5679514 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 @@ -72,4 +72,6 @@ public interface IInvoicingApi { String addWaringAll(CgdInfoEntity cgdInfoEntityDto); String pickingInfo(CgdInfoEntity cgdInfoEntityDto); + + String editPrice(CgdInfoEntity cgdInfoEntityDto); } 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 26211b1..1d2209b 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 @@ -90,69 +90,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl cgdInfoList = nuInvoicingCgdMain.getCgdInfoList(); - List cgdGzdInfoList = new ArrayList<>(); - for (NuInvoicingCgdInfo nuInvoicingCgdInfo : cgdInfoList) { - cgdInfoMapper.updateById(nuInvoicingCgdInfo); - //入库数量不为空，并且大于0 - if(StringUtils.isNotBlank(nuInvoicingCgdInfo.getRksl()+"") && nuInvoicingCgdInfo.getRksl() > 0){ - String nuId = nuInvoicingCgdInfo.getNuId(); - String wlId = nuInvoicingCgdInfo.getWlId(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("nu_id",nuId).eq("wl_id",wlId); - BlWarehouseMaterialInfo warehouseMaterialInfo = mterialInfoMapper.selectOne(queryWrapper); - String czqkcl = warehouseMaterialInfo.getKcsl();//操作前库存量 - if(warehouseMaterialInfo != null){ - String kcsl = warehouseMaterialInfo.getKcsl(); - if(StringUtils.isNotBlank(kcsl)){ - warehouseMaterialInfo.setKcsl(String.valueOf(Integer.parseInt(kcsl) + nuInvoicingCgdInfo.getRksl())); - mterialInfoMapper.updateById(warehouseMaterialInfo); - - - NuWarehouseMaterialCrkInfo crkInfo = new NuWarehouseMaterialCrkInfo(); - crkInfo.setCgdId(nuInvoicingCgdMain.getId()); - crkInfo.setNuId(nuId); - crkInfo.setWlId(wlId); - crkInfo.setCrkNum(nuInvoicingCgdInfo.getRksl()); - crkInfo.setCrkType("1"); - crkInfo.setContent("采购入库"); - crkInfo.setDqkcl(warehouseMaterialInfo.getKcsl()); - crkInfo.setCzqkcl(czqkcl); - crkInfoMapper.insert(crkInfo); - } - } - } - - //判断是否有未入库的数量 - Integer wrksl = nuInvoicingCgdInfo.getWrksl(); - if(StringUtils.isNotBlank(wrksl+"") && wrksl > 0){ - nuInvoicingCgdInfo.setId(null); - nuInvoicingCgdInfo.setPurchaseQuantity(wrksl); - nuInvoicingCgdInfo.setRksl(null); - nuInvoicingCgdInfo.setWrksl(null); - cgdGzdInfoList.add(nuInvoicingCgdInfo); - } - } - nuInvoicingCgdMain.setStatus("2");//采购完成 - baseMapper.updateById(nuInvoicingCgdMain); - //判断是否有挂帐单数据,如果有生成挂帐单数据 - if(cgdGzdInfoList.size() > 0){ - String cgdNo = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.format("%06d", new Random().nextInt(1000000)); - nuInvoicingCgdMain.setId(null); - nuInvoicingCgdMain.setCgdNo(cgdNo); - nuInvoicingCgdMain.setStatus("1");//采购中 - nuInvoicingCgdMain.setCgdType("1");//挂帐单 - nuInvoicingCgdMain.setSxdPath(null);//清空随行单的单据 - nuInvoicingCgdMain.setXzdPath(null);//清空销账单的单据 - nuInvoicingCgdMain.setJzdPath(null);//清空结账单的单据 - baseMapper.insert(nuInvoicingCgdMain); - for (NuInvoicingCgdInfo nuInvoicingCgdInfo : cgdGzdInfoList){ - nuInvoicingCgdInfo.setCgdId(nuInvoicingCgdMain.getId()); - nuInvoicingCgdInfo.setCreateTime(new Date()); - cgdInfoMapper.insert(nuInvoicingCgdInfo); - } - } } @Override @@ -305,8 +242,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl cgdInfoList = new ArrayList<>(); @@ -415,6 +352,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); List list = cgdMainMapper.selectList(page,queryWrapper); IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); @@ -901,18 +839,28 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl