换绑功能优化

skyouc

6 小时以前 a572f1428af7a5d6eeaf973363c33785ea182bd3

换绑功能优化

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

@@ -14,6 +14,7 @@
import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocItemWorkingServiceImpl;
import com.vincent.rsf.server.manager.service.impl.StockItemServiceImpl;
import com.vincent.rsf.server.manager.service.impl.StockServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -63,6 +64,10 @@
    private StockService stockService;
    @Autowired
    private StockItemServiceImpl stockItemService;
    @Autowired
    private LocItemService locItemService;
    @Autowired
    private LocItemWorkingService locItemWorkingService;

    @Override
    public R getOutStockTaskItem(String barcode) {
@@ -399,6 +404,25 @@
            if (!taskItemService.updateById(item)) {
               throw new CoolException("任务明细修改失败");
            }
            LocItemWorking oldOne = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
                    .eq(LocItemWorking::getMatnrCode, byId.getMatnrCode())
                    .eq(LocItemWorking::getFieldsIndex, byId.getFieldsIndex()));
            if (Objects.isNull(oldOne)) {
                throw new CoolException("明细不存在或已出库！！");
            }
            LocItemWorking one = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
                            .eq(LocItemWorking::getMatnrCode, byId.getMatnrCode())
                    .eq(LocItemWorking::getFieldsIndex, uuid));
            if (Objects.isNull(one)) {
                throw new CoolException("明细不存在或已出库！！");
            }
            one.setWorkQty(oldOne.getWorkQty());
            oldOne.setWorkQty(0.0);

            //更新库位信息
            locItemWorkingService.updateById(oldOne);
            locItemWorkingService.updateById(one);

        }
        return R.ok();
    }
@@ -447,7 +471,7 @@
                }
            }
        } catch (Exception e) {
            throw new CoolException("分揀失败");
            throw new CoolException("分拣失败");
        }
        return R.ok();
    }

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

@@ -24,6 +24,7 @@
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocItemWorkingServiceImpl;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.manager.service.impl.WaveOrderRelaServiceImpl;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
@@ -99,6 +100,9 @@
    private ReportMsgService reportMsgService;
    @Autowired
    private WaveOrderRelaService waveOrderRelaService;
    @Autowired
    private LocItemWorkingService locItemWorkingService;


    /**
     * @param
@@ -645,6 +649,9 @@
                itemLogs.add(itemLog);
            }

            locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));


            if (!taskService.removeById(task.getId())) {
                throw new CoolException("原始任务删除失败！！");
            }
@@ -657,6 +664,8 @@
                    throw new CoolException("原始任务明细删除失败！！");
                }
            }


        });
    }


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

@@ -1216,7 +1216,6 @@
            throw new CoolException("库存状态更新失败！！");
        }


//        if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
//            if (!this.update(new LambdaUpdateWrapper<Task>()
//                    .eq(Task::getId, task.getId())