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-19 10:18:19 +08:00
parent f0c90cc5bd
commit fb93da2094
1 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -920,23 +920,10 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
if(StringUtils.equals("0",jhType)){//入库操作
mterialInfo.setKcsl(dqkcl);
mterialInfoMapper.updateById(mterialInfo);
}
/**单据状态 0待入库 1挂账中 2已入库 3已销账*/
//判断是否是销账操作，不是销账的话
if (StringUtils.equals("0",jhType)){
cgdInfo.setStatus("2");
}else{
//不是销账判断是是否有未入库数量，如果大于0则代表挂账中
if(wrksl>0){
cgdInfo.setStatus("2");
}else if(!StringUtils.equals("3",cgdInfo.getStatus())){
cgdInfo.setStatus("1");
}else{
cgdInfo.setStatus("3");
}
}
//更新采购单物料信息
//未入库数量 = 采购数量 - 入库数量 - 销账数量
@ -944,21 +931,48 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
cgdInfo.setWrksl(wrksl);
cgdInfo.setRksl(rksl);
cgdInfo.setXzsl(xzsl);
/**单据状态 0待入库 1挂账中 2已入库 3已销账*/
//判断是否是销账操作，不是销账的话
if(StringUtils.equals("3",cgdInfo.getStatus())){
cgdInfo.setStatus("3");
} else if(wrksl>0){
cgdInfo.setStatus("1");
} else{
cgdInfo.setStatus("2");
}
cgdInfoMapper.updateById(cgdInfo);
//更新主表拣货人信息
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//判断拣货人信息是否为空，不为空就给值
if(StringUtils.isEmpty(cgdMain.getJhBy())){
// cgdMain.setJhBy(loginUser.getRealname());
cgdMain.setJhBy(loginUser.getRealname());
cgdMain.setJhTime(new Date());
cgdMain.setStatus("1");//带完结
cgdMain.setCgdType("1");//待入库
cgdMainMapper.updateById(cgdMain);
}
//查询全部采购单信息
List<NuInvoicingCgdInfo> cgdInfoList = cgdInfoMapper.selectList(new QueryWrapper<NuInvoicingCgdInfo>().eq("cgd_id",cgdInfo.getCgdId()));
int count = 0;
/**单据状态 0待入库 1挂账中 2已入库 3已销账*/
for (NuInvoicingCgdInfo info : cgdInfoList) {
//判断采购物料状态
if(StringUtils.equals("2",info.getStatus())){
count++;
}else if(StringUtils.equals("3",info.getStatus()) || StringUtils.equals("2",info.getStatus())){
count++;
}else if(StringUtils.equals("0",info.getStatus())){
break;
}
}
//判断单据是否完结 如果采购数量 = 入库数量 + 销账数量 就代表这个单据完结了
if(cgsl == rksl + xzsl){
// cgdMain.setWjBy(loginUser.getRealname());
if(count == cgdInfoList.size()){
cgdMain.setWjBy(loginUser.getRealname());
cgdMain.setWjTime(new Date());
cgdMain.setStatus("2");//已完结
cgdMain.setCgdType("2");//已完结