yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加改价接口

This commit is contained in:
yangjun 2025-11-17 10:45:20 +08:00
parent 6e8fba6c87
commit cbef3ddb05
4 changed files with 49 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
View File

@ -329,4 +329,18 @@ public class InvoicingApi {
return Result.OK("操作成功！");
}
@ApiOperation(value="请购单改价", notes="请购单改价")
@AutoLog(value = "请购单改价")
@PostMapping(value = "/editPrice")
public Result<String> 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("操作成功！");
}
}

18
nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java
View File

@ -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;
}

2
nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java
View File

@ -72,4 +72,6 @@ public interface IInvoicingApi {
String addWaringAll(CgdInfoEntity cgdInfoEntityDto);
String pickingInfo(CgdInfoEntity cgdInfoEntityDto);
String editPrice(CgdInfoEntity cgdInfoEntityDto);
}

82
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
View File

@ -90,69 +90,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
@Override
public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) {
List<NuInvoicingCgdInfo> cgdInfoList = nuInvoicingCgdMain.getCgdInfoList();
List<NuInvoicingCgdInfo> 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<BlWarehouseMaterialInfo> 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<NuInvoicingCgdMai
cgdMain.setGysLxr(ConfigSuppliersInfo.getPersonInCharge());
cgdMain.setGysLxrdh(ConfigSuppliersInfo.getContactNumber());
cgdMain.setGysOpenId(ConfigSuppliersInfo.getWechartId());
cgdMain.setStatus("0");
cgdMain.setCgdType("0");
cgdMain.setStatus("0");//待入库
cgdMain.setCgdType("0");//待入库
cgdMain.setGysName(ConfigSuppliersInfo.getSuppliersName());
// cgdMainMapper.insert(cgdMain);
List<NuInvoicingCgdInfo> cgdInfoList = new ArrayList<>();
@ -415,6 +352,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType()),"cgd_type",cgdMainEntityDto.getCgdType());
Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(page,queryWrapper);
IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
@ -901,18 +839,28 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
if(StringUtils.isEmpty(cgdMain.getJhBy())){
// cgdMain.setJhBy(loginUser.getRealname());
cgdMain.setJhTime(new Date());
cgdMain.setStatus("1");
cgdMain.setStatus("1");//带完结
cgdMain.setCgdType("1");//待入库
cgdMainMapper.updateById(cgdMain);
}
//判断单据是否完结 如果采购数量 = 入库数量 + 销账数量 就代表这个单据完结了
if(cgsl == rksl + xzsl){
// cgdMain.setWjBy(loginUser.getRealname());
cgdMain.setWjTime(new Date());
cgdMain.setStatus("2");
cgdMain.setStatus("2");//已完结
cgdMain.setCgdType("2");//已完结
cgdMainMapper.updateById(cgdMain);
}
return "1";
}
@Override
public String editPrice(CgdInfoEntity cgdInfoEntityDto) {
NuInvoicingCgdInfo cgdInfo = new NuInvoicingCgdInfo();
BeanUtils.copyProperties(cgdInfoEntityDto,cgdInfo);
cgdInfoMapper.updateById(cgdInfo);
return "1";
}
}