修改bug
This commit is contained in:
parent
3c7926608a
commit
4585faf518
|
|
@ -235,7 +235,10 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
|
||||||
@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
|
@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
|
||||||
@PostMapping(value = "/addAllWuliao")
|
@PostMapping(value = "/addAllWuliao")
|
||||||
public Result<String> addAllWuliao(@RequestBody BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
|
public Result<String> addAllWuliao(@RequestBody BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
|
||||||
blWarehouseMaterialInfoService.addAllWuliao(blWarehouseMaterialInfo);
|
String result = blWarehouseMaterialInfoService.addAllWuliao(blWarehouseMaterialInfo);
|
||||||
|
if(StringUtils.equals("2",result)){
|
||||||
|
return Result.error("当前无物料可进行操作");
|
||||||
|
}
|
||||||
return Result.OK("添加成功!");
|
return Result.OK("添加成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ import java.util.Map;
|
||||||
*/
|
*/
|
||||||
public interface IBlWarehouseMaterialInfoService extends IService<BlWarehouseMaterialInfo> {
|
public interface IBlWarehouseMaterialInfoService extends IService<BlWarehouseMaterialInfo> {
|
||||||
|
|
||||||
void addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo);
|
String addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo);
|
||||||
|
|
||||||
void deleteBatch(String ids);
|
void deleteBatch(String ids);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,12 +49,15 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
|
public String addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
//获取仓库nuid
|
//获取仓库nuid
|
||||||
String nuId = blWarehouseMaterialInfo.getNuId();
|
String nuId = blWarehouseMaterialInfo.getNuId();
|
||||||
//获取所有剩余的物料信息,并且去掉库存上限或者下限为空的数据
|
//获取所有剩余的物料信息,并且去掉库存上限或者下限为空的数据
|
||||||
List<BlWarehouseMaterialInfo> list =baseMapper.getRemainingList(blWarehouseMaterialInfo);
|
List<BlWarehouseMaterialInfo> list =baseMapper.getRemainingList(blWarehouseMaterialInfo);
|
||||||
|
if(list.size()==0){
|
||||||
|
return "2";
|
||||||
|
}
|
||||||
//将所有查询到的物料进行批量新增
|
//将所有查询到的物料进行批量新增
|
||||||
for(BlWarehouseMaterialInfo blWarehouseMaterialInfo1:list){
|
for(BlWarehouseMaterialInfo blWarehouseMaterialInfo1:list){
|
||||||
blWarehouseMaterialInfo1.setNuId(nuId);
|
blWarehouseMaterialInfo1.setNuId(nuId);
|
||||||
|
|
@ -62,6 +65,7 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
|
||||||
blWarehouseMaterialInfo1.setCreateTime(new Date());
|
blWarehouseMaterialInfo1.setCreateTime(new Date());
|
||||||
}
|
}
|
||||||
baseMapper.batchInsert(list);
|
baseMapper.batchInsert(list);
|
||||||
|
return "1";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue