| | |
|---|
| | | TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode)); |
|---|
| | | if (!Cools.isEmpty(taskWrk1)) { |
|---|
| | | log.info("托盘码：" + barcode + "任务档存在"); |
|---|
| | | if (taskWrk1.getIoType() == 1 && taskWrk1.getStatus() < 3 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) { |
|---|
| | | if (taskWrk1.getIoType() == 1 && taskWrk1.getStatus() < 3 && (taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString()) || taskWrk1.getStartPoint().equals(String.valueOf((staProtocol.getSiteId()+1))))) { |
|---|
| | | StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() |
|---|
| | | .eq("CRN_NO", taskWrk1.getCrnNo()).eq("TYPE_NO", 1).eq("STN_NO", staProtocol.getSiteId())); |
|---|
| | | |
|---|
