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

修改操作逻辑

This commit is contained in:
yangjun 2025-12-05 14:05:03 +08:00
parent 11b0bda878
commit b2a1f1d33b
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1082,7 +1082,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
} }
crkInfo.setDqkcl(dqkcl);//当前库存量(操作后的库存量) crkInfo.setDqkcl(dqkcl);//当前库存量(操作后的库存量)
crkInfo.setContent("采购单："+cgdMain.getCgdNo()); crkInfo.setContent("采购单："+cgdMain.getCgdNo());
if(crkInfo.getCrkNum()>0){ if(crkInfo.getCrkNum()>0 && StringUtils.equals("0",jhType)){
crkInfoMapper.insert(crkInfo); crkInfoMapper.insert(crkInfo);
} }
@ -1134,7 +1134,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
//判断采购物料状态 //判断采购物料状态
if(StringUtils.equals("2",info.getStatus())){ if(StringUtils.equals("2",info.getStatus())){
count++; count++;
}else if(StringUtils.equals("3",info.getStatus()) || StringUtils.equals("2",info.getStatus())){ }else if((StringUtils.equals("3",info.getStatus()) || StringUtils.equals("2",info.getStatus()) && wrksl==0)){
count++; count++;
}else if(StringUtils.equals("0",info.getStatus())){ }else if(StringUtils.equals("0",info.getStatus())){
break; break;

2
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
View File

@ -284,7 +284,7 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
@ApiOperation(value = "库房物料配置信息-物料是否占用", notes = "库房物料配置信息-物料是否占用") @ApiOperation(value = "库房物料配置信息-物料是否占用", notes = "库房物料配置信息-物料是否占用")
@GetMapping(value = "/queryWlsfzy") @GetMapping(value = "/queryWlsfzy")
public Result<Map<String,Object>> queryWlsfzy(@RequestParam(name = "wlId", required = true) String wlId,@RequestParam(name = "nuId", required = true) String nuId) { public Result<Map<String,Object>> queryWlsfzy(@RequestParam(name = "wlId", required = true) String wlId,@RequestParam(name = "nuId", required = false) String nuId) {
Map<String,Object> map = blWarehouseMaterialInfoService.queryWlsfzy(wlId, nuId); Map<String,Object> map = blWarehouseMaterialInfoService.queryWlsfzy(wlId, nuId);
return Result.OK(map); return Result.OK(map);
} }

13
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java
View File

@ -77,6 +77,19 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
@Override @Override
public Map<String,Object> queryWlsfzy(String wlId, String nuId) { public Map<String,Object> queryWlsfzy(String wlId, String nuId) {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
List<BlWarehouseMaterialInfo> kcslList =baseMapper.selectList(new QueryWrapper<BlWarehouseMaterialInfo>().eq("wl_id", wlId));
String sfxkcsl = "0";
for(BlWarehouseMaterialInfo blWarehouseMaterialInfo:kcslList){
if(Integer.parseInt(blWarehouseMaterialInfo.getKcsl())>0){
sfxkcsl = "1";
break;
}
}
if ("1".equals(sfxkcsl)){
map.put("message","库存数量不为0，请先清空库存数量后再停用");
}
//查询采购单数据是否有占用的 //查询采购单数据是否有占用的
List<NuInvoicingCgdMain> cgdMainList = nuInvoicingCgdMainMapper.selecCgdWlsfzytList(wlId); List<NuInvoicingCgdMain> cgdMainList = nuInvoicingCgdMainMapper.selecCgdWlsfzytList(wlId);
if(cgdMainList.size()>0){ if(cgdMainList.size()>0){