盘点流程

chen.lin

1 天以前 11514b301466eb7598073d0126c6d9781daaa3ba

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

@@ -573,6 +573,7 @@
        if (flowStepInstance.getWmsNextTaskStatus() != 9999) {
            FlowStepInstance nextFlowStepInstance = flowStepInstanceService.getOne(new LambdaQueryWrapper<FlowStepInstance>()
                    .eq(FlowStepInstance::getStatus, (short)0)
                    .eq(FlowStepInstance::getTaskNo, flowStepInstance.getTaskNo())
                    .eq(FlowStepInstance::getStepOrder, flowStepInstance.getStepOrder() + 1)
                    .eq(FlowStepInstance::getWmsNowTaskStatus, flowStepInstance.getWmsNextTaskStatus()));
            if (Cools.isEmpty(nextFlowStepInstance)) {
@@ -698,7 +699,7 @@
                    }
                    String shallowLocNo = LocUtils.getShallowLoc(loc1.getCode());
                    // 检测目标库位是否为空库位
                    Loc shallowLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLocNo));
                    Loc shallowLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLocNo).last("limit 1"));
                    if (shallowLoc != null && shallowLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
                        if (LocUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
                            loc = shallowLoc;
@@ -1079,9 +1080,16 @@

                flowStepInstanceService.updateById(flowStepInstance);
                taskService.updateById(task);
                // 盘点再入库任务经 WCS 上报变为 100（库存更新完成）时，同步将盘点差异单置为已审核
                if (TaskType.TASK_TYPE_CHECK_IN.type.equals(task.getTaskType())
                        && flowStepInstance.getWmsNextTaskStatus() != null
                        && flowStepInstance.getWmsNextTaskStatus().equals(TaskStsType.UPDATED_IN.id)) {
                    taskService.markCheckDiffApprovedWhenCheckInDone(task);
                }
                if (flowStepInstance.getWmsNextTaskStatus() != 9999) {
                    FlowStepInstance nextFlowStepInstance = flowStepInstanceService.getOne(new LambdaQueryWrapper<FlowStepInstance>()
                            .eq(FlowStepInstance::getStatus, (short)0)
                            .eq(FlowStepInstance::getTaskNo, flowStepInstance.getTaskNo())
                            .eq(FlowStepInstance::getStepOrder, flowStepInstance.getStepOrder() + 1)
                            .eq(FlowStepInstance::getWmsNowTaskStatus, flowStepInstance.getWmsNextTaskStatus()));
                    if (Cools.isEmpty(nextFlowStepInstance)) {