lsh#

1

1 天以前 7a6a39102cdb4fa6c9bc9dfad56a8ad0a6c14f94

lsh#

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java

@@ -170,7 +170,8 @@
    @Transactional(rollbackFor = Exception.class)
    public synchronized R generateTasks(PdaGeneralParam param, Long loginUserId) {

//        DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getSite,param.getTransferStationNo()).orderByDesc(DeviceSite::getId),false);
//        DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getSite,param.getTransferStationNo()).orderByDesc(DeviceSite::getId)
//        .last("LIMIT 1"));
//        if (Objects.isNull(deviceSite)) {
//            throw new CoolException("站点不存在！！");
//        }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java

@@ -67,7 +67,8 @@
    @PostMapping("/loc/areaNoUse/list")
    public R areaNoUselist(@RequestBody Map<String, Object> map) {
        String locCode = map.get("locCode").toString();
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode)
                .last("LIMIT 1"));
        List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
                .eq(Loc::getAreaId, loc.getAreaId())
                .eq(!Objects.isNull(loc.getChannel()), Loc::getChannel,loc.getChannel())

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java

@@ -57,7 +57,8 @@
    @PostMapping("/locPreview/areaNoUse/list")
    public R areaNoUselist(@RequestBody Map<String, Object> map) {
        String locCode = map.get("locCode").toString();
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode)
                .last("LIMIT 1"));
        List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
                .eq(Loc::getAreaId, loc.getAreaId())
                .eq(Loc::getChannel,loc.getChannel())

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java

@@ -117,7 +117,7 @@
            WaitPakin waitPakin = waitPakinService.getById(id);
            BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                            .eq(BasStation::getBarcode, waitPakin.getBarcode())
                    ,false
                    .last("LIMIT 1")
            );
            if (!Cools.isEmpty(isBarcodeSta)){
                throw new CoolException("该条码已被"+isBarcodeSta.getStationName()+"站绑定");

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java

@@ -80,7 +80,8 @@
            for (String c : split) {
                WarehouseAreas byId = warehouseAreasService.getById(Integer.parseInt(c));
                if (!Cools.isEmpty(byId)) {
                    Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type),false);
                    Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)
                            .last("LIMIT 1"));
                    if (!Objects.isNull(loc)) {
                        curLoc = loc.getCode();
                        break;
@@ -95,7 +96,8 @@
            for (String c : split) {
                WarehouseAreas byId = warehouseAreasService.getById(Integer.parseInt(c));
                if (!Cools.isEmpty(byId)) {
                    Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type),false);
                    Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
                            .last("LIMIT 1"));
                    if (!Objects.isNull(loc)) {
                        deepLoc = loc.getCode();
                        break;
@@ -150,7 +152,8 @@
            for (String c : split) {
                WarehouseAreas byId = warehouseAreasService.getById(Integer.parseInt(c));
                if (!Cools.isEmpty(byId)) {
                    Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type),false);
                    Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type)
                            .last("LIMIT 1"));
                    if (!Objects.isNull(loc)) {
                        curLoc = loc.getCode();
                        break;
@@ -190,7 +193,8 @@
                if (!Cools.isEmpty(byId)) {
                    if (sign){
                        areaList.add(byId.getId());
                        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type),false);
                        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
                                .last("LIMIT 1"));
                        if (!Objects.isNull(loc)) {
                            deepLoc = loc.getCode();
                            sign = false;