#库存明细显示单据类型

Junjie

2024-07-05 5fc438a3adb8c2f52dac7786e5ee4a6564f82d70

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java

@@ -80,13 +80,25 @@
        return R.ok();
    }

   @RequestMapping(value = "/locMast/update/auth")
   @ManagerAuth
    @RequestMapping(value = "/locMast/update/auth")
    @ManagerAuth(memo = "库位修改")
    public R update(LocMast locMast){
        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
            return R.error();
        }
        locMastService.updateById(locMast);
        LocMast oldLocMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locMast.getLocNo()).eq(LocMast::getHostId, getHostId()));
        if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
            return R.error("当前操作已被阻止，请联系管理员");
        }
        // 有物料时修改为空库位或者空板库位，则删除库存明细
        if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
            if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
                locDetlService.remove(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locMast.getLocNo()));
            }
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());
        locMastService.update(locMast,new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locMast.getLocNo()).eq(LocMast::getHostId, getHostId()));
        return R.ok();
    }

@@ -172,6 +184,7 @@
                    locMast.setModiUser(getUserId());
                    locMast.setModiTime(new Date());
                    locMast.setHostId(hostId);
                    locMast.setWhsType(0L);
                    list.add(locMast);
                }
            }
@@ -204,7 +217,7 @@
            list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
            list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
        }
        return R.ok().add(pics);
        return R.ok().add(list);
    }

}