| | |
| | | */ |
| | | @Override |
| | | public Tasking startMachineTask(Machine machine, String scan_id) { |
| | | List<Tasking> list=this.findMachineWorkStateTask(machine,"等待"); |
| | | //List<Tasking> list=this.findMachineWorkStateTask(machine,"等待"); |
| | | List<Tasking> list=baseMapper.selectJoinList(Tasking.class,new MPJLambdaWrapper<Tasking>() |
| | | .selectAll(Tasking.class) |
| | | .innerJoin(LineConfiguration.class,LineConfiguration::getId,Tasking::getLineConfigurationId) |
| | | .innerJoin(Machine.class,Machine::getId,LineConfiguration::getMachineId) |
| | | .eq(LineConfiguration::getMachineId,machine.getId()) |
| | | .eq(Tasking::getGlassState,"正常") |
| | | .eq(Tasking::getState,"线上") |
| | | .eq(Tasking::getScanId,scan_id) |
| | | .eq(Tasking::getWorkState,"等待") |
| | | .orderByAsc(Tasking::getTaskSequence)); |
| | | if(!list.isEmpty()){ |
| | | Tasking tasking=list.get(0); |
| | | if(scan_id.equals(tasking.getScanId())){ |
| | |
| | | List<Tasking> listTasking=baseMapper.selectList(new QueryWrapper<Tasking>().lambda() |
| | | .eq(Tasking::getScanId,scanId) |
| | | .ne(Tasking::getLineConfigurationId,113) |
| | | .ne(Tasking::getWorkState,"完工") |
| | | .ne(Tasking::getState,"线下") |
| | | .ne(Tasking::getGlassState,"破损")); |
| | | if((listTasking.size()<primitiveTaskList.get(0).getTaskQuantity())||machine.getMode()==3){ |
| | | Machine oneMachine=machineMapper.selectById(1L); |
| | | if((listTasking.size()<primitiveTaskList.get(0).getTaskQuantity())||oneMachine.getMode()==3){ |
| | | Tasking tasking=primitiveTaskService.convertListTasking(primitiveTask,lineConfiguration.getId()); |
| | | Integer taskSequence=1; |
| | | if (machine.getTodayCount()>0&&machine.getTodayCount()<5000){ |
| | |
| | | if (machine.getId()==24){ |
| | | List<KBBTLensSorting> list=kBBTLensSortingMapper.selectList(new QueryWrapper<KBBTLensSorting>().lambda() |
| | | .eq(KBBTLensSorting::getBarcode,scanId) |
| | | .notLike(KBBTLensSorting::getProductionOrder,"防碎膜")); |
| | | .notLike(KBBTLensSorting::getProductionName,"防碎膜") |
| | | .notLike(KBBTLensSorting::getProductionName,"磨砂") |
| | | .notLike(KBBTLensSorting::getProductionName,"倒角")); |
| | | if (list.size()>0){ |
| | | Warehouse=list.get(0).getWarehouse(); |
| | | } |