From 90aebfd01b39f64df11e21fe53d998866f42cf85 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 10 Oct 2025 10:30:44 +0800 Subject: [PATCH] 1 --- .../java/com/nu/entity/ElderServerEntity.java | 9 ++++ .../elderinfo/mapper/xml/ElderInfoMapper.xml | 9 +++- .../NuInvoicingCgdMainController.java | 43 +++++++++++----- .../cgd/entity/NuInvoicingCgdMain.java | 23 +++++---- .../service/INuInvoicingCgdMainService.java | 1 + .../impl/NuInvoicingCgdMainServiceImpl.java | 51 +++++++++++++++++++ .../qgd/service/impl/QgdInfoServiceImpl.java | 7 +++ .../qgd/service/impl/QgdMainServiceImpl.java | 6 ++- 8 files changed, 126 insertions(+), 23 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java index 7295f368..fa5292f6 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java @@ -71,4 +71,13 @@ public class ElderServerEntity implements Serializable { private Date updateTime; /**所属部门*/ private String sysOrgCode; + + /**服务指令图片大图*/ + private String previewFile; + /**服务指令图片小图*/ + private String previewFileSmall; + /**即时指令图片*/ + private String immediateFile; + /**即时指令焦点图片*/ + private String immediateFileFocu; } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml index 3013791c..0f555e29 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml @@ -3,6 +3,13 @@ diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java index 26cef3b3..e2ea545b 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java @@ -62,8 +62,8 @@ public class NuInvoicingCgdMainController extends JeecgController> queryPageList(NuInvoicingCgdMain nuInvoicingCgdMain, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -81,8 +81,8 @@ public class NuInvoicingCgdMainController extends JeecgController add(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) { @@ -96,8 +96,8 @@ public class NuInvoicingCgdMainController extends JeecgController edit(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) { @@ -111,8 +111,8 @@ public class NuInvoicingCgdMainController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { @@ -126,8 +126,8 @@ public class NuInvoicingCgdMainController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -141,8 +141,8 @@ public class NuInvoicingCgdMainController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { NuInvoicingCgdMain nuInvoicingCgdMain = nuInvoicingCgdMainService.getById(id); @@ -177,4 +177,23 @@ public class NuInvoicingCgdMainController extends JeecgController auditInfo(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) { + nuInvoicingCgdMainService.updateById(nuInvoicingCgdMain); + return Result.OK("添加成功！"); + } + + @AutoLog(value = "采购单-入库操作") + @ApiOperation(value="采购单-入库操作", notes="采购单-入库操作") + @RequiresPermissions("cgd:nu_invoicing_cgd_main:add") + @PostMapping(value = "/rukuInfo") + public Result rukuInfo(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) { + nuInvoicingCgdMainService.rukuInfo(nuInvoicingCgdMain); + return Result.OK("添加成功！"); + } + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java index 7c5b3077..b35ad603 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java @@ -4,10 +4,9 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -92,14 +91,17 @@ public class NuInvoicingCgdMain implements Serializable { /**付款方式*/ @Excel(name = "付款方式", width = 15) @ApiModelProperty(value = "付款方式") + @Dict(dicCode = "gys_fkfs") private String gysFkfs; /**状态 0:待采购 1：采购中 2采购完成 3作废*/ - @Excel(name = "状态 0:待采购 1：采购中 2采购完成 3作废", width = 15) - @ApiModelProperty(value = "状态 0:待采购 1：采购中 2采购完成 3作废") + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + @Dict(dicCode = "cgd_status") private String status; - /**采购单类型 0采购单 1挂帐单 2作废*/ - @Excel(name = "采购单类型 0采购单 1挂帐单 2作废", width = 15) - @ApiModelProperty(value = "采购单类型 0采购单 1挂帐单 2作废") + /**采购单类型 0采购单 1挂帐单 2结账单 9作废*/ + @Excel(name = "采购单类型", width = 15) + @ApiModelProperty(value = "采购单类型") + @Dict(dicCode = "cgd_type") private String cgdType; /**随行单*/ @Excel(name = "随行单", width = 15) @@ -127,4 +129,7 @@ public class NuInvoicingCgdMain implements Serializable { @Excel(name = "审核备注", width = 15) @ApiModelProperty(value = "审核备注") private String content; + + @TableField(exist = false) + private List cgdInfoList; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdMainService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdMainService.java index 99f18db8..533c59af 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdMainService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdMainService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface INuInvoicingCgdMainService extends IService { + void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain); } 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 351b1502..667d6aff 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 @@ -1,12 +1,22 @@ package com.nu.modules.cgd.service.impl; +import com.nu.modules.cgd.entity.NuInvoicingCgdInfo; import com.nu.modules.cgd.entity.NuInvoicingCgdMain; +import com.nu.modules.cgd.mapper.NuInvoicingCgdInfoMapper; import com.nu.modules.cgd.mapper.NuInvoicingCgdMainMapper; import com.nu.modules.cgd.service.INuInvoicingCgdMainService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Random; + /** * @Description: nu_invoicing_cgd_main * @Author: jeecg-boot @@ -16,4 +26,45 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class NuInvoicingCgdMainServiceImpl extends ServiceImpl implements INuInvoicingCgdMainService { + @Autowired + private NuInvoicingCgdInfoMapper cgdInfoMapper; + + @Override + public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) { + + List cgdInfoList = nuInvoicingCgdMain.getCgdInfoList(); + List cgdGzdInfoList = new ArrayList<>(); + for (NuInvoicingCgdInfo nuInvoicingCgdInfo : cgdInfoList) { + nuInvoicingCgdInfo.setMainId(nuInvoicingCgdMain.getId()); + cgdInfoMapper.updateById(nuInvoicingCgdInfo); + //判断是否有未入库的数量 + String wrksl = nuInvoicingCgdInfo.getWrksl(); + if(StringUtils.isNotBlank(wrksl) && Integer.parseInt(wrksl) > 0){ + nuInvoicingCgdInfo.setId(null); + nuInvoicingCgdInfo.setPurchaseQuantity(Integer.parseInt(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); + } + } + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java index 54ad6c02..2e6a76e0 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java @@ -79,6 +79,13 @@ public class QgdInfoServiceImpl extends ServiceImpl impl info.setWlUnits(ConfigMaterialInfo.getMaterialUnits()); info.setWlUpperLimit(warehouseMaterialInfo.getUpperLimit()); info.setWlLowerLimit(warehouseMaterialInfo.getLowerLimit()); + if(StringUtils.equals("1",ConfigMaterialInfo.getMultiUnitType())){ + info.setReferenceUnitPrice(ConfigMaterialInfo.getOneUnitPrice()+""); + }else if(StringUtils.equals("2",ConfigMaterialInfo.getMultiUnitType())){ + info.setReferenceUnitPrice(ConfigMaterialInfo.getTwoUnitPrice()+""); + } else if(StringUtils.equals("3",ConfigMaterialInfo.getMultiUnitType())){ + info.setReferenceUnitPrice(ConfigMaterialInfo.getReferenceUnitPrice()+""); + } baseMapper.insert(info); } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java index ba6df68a..68a0d11a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java @@ -125,7 +125,11 @@ public class QgdMainServiceImpl extends ServiceImpl impl } System.out.println(mapList); - + //修改请购单状态-变成已经下单 + QgdMain qgdMain1 = new QgdMain(); + qgdMain1.setId(qgdMain.getId()); + qgdMain1.setStatus(1); + baseMapper.updateById(qgdMain1); return "1"; }