#备货+订单编辑bug修改

zhou zhou

13 小时以前 4d98ae91ea5a7edeaf2cc4f168ca7d87d1d44994

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java

@@ -106,11 +106,11 @@
                //空容器出库
                DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
                        .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel())
                        .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPITY_OUT.type));
                        .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPTY_OUT.type));
                if (Objects.isNull(deviceSite)) {
                    throw new CoolException("站点不支持空容器出库！！");
                }
                task.setTaskType(TaskType.TASK_TYPE_EMPITY_OUT.type).setWarehType(deviceSite.getDevice());
                task.setTaskType(TaskType.TASK_TYPE_EMPTY_OUT.type).setWarehType(deviceSite.getDevice());
        } else {
            throw new CoolException("空容器出库！！其他类型无效，进入类型："+map.getType());
        }
@@ -174,6 +174,11 @@
            if (!locService.updateById(loc)) {
                throw new CoolException("库位状态更新失败！！");
            }

            //增加对备货单得判断
            Integer taskStatus = resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
                    ? TaskStsType.MISSION_INITIAL.id:TaskStsType.GENERATE_OUT.id;

            Task moveTask = new Task();
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
            task.setOrgLoc(loc.getCode())
@@ -185,7 +190,7 @@
                    .setCreateBy(loginUserId)
                    .setCreateTime(new Date())
                    .setUpdateTime(new Date())
                    .setTaskStatus(TaskStsType.GENERATE_OUT.id)
                    .setTaskStatus(taskStatus)
                    .setBarcode(loc.getBarcode())
                    .setMemo(map.getMemo());

@@ -282,6 +287,9 @@
                        .setCreateBy(loginUserId)
                        .setCreateTime(new Date())
                        .setUpdateTime(new Date())
                        .setSplrBatch(item.getBatch())
                        .setPlatWorkCode(item.getPlatWorkCode())
                        .setPlatItemId(item.getPlatItemId())
                        .setOrderType(OrderType.ORDER_OUT.type);
                if (map.getType().equals(Constants.TASK_TYPE_ORDER_OUT_STOCK)) {
                    taskItem.setWkType(Short.parseShort(order.getWkType()))
@@ -425,6 +433,9 @@
                        .setSourceCode(item.getLocCode())
                        .setSource(item.getId())
                        .setUpdateTime(new Date())
                        .setSplrBatch(item.getBatch())
                        .setPlatWorkCode(item.getPlatWorkCode())
                        .setPlatItemId(item.getPlatItemId())
                        .setOrderType(OrderType.ORDER_IN.type)
                        .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
                taskItems.add(taskItem);