| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | //StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta())); |
|---|
| | | if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null){ |
|---|
| | | boolean sign = true; |
|---|
| | | if (inSta.getBarcode() == 7 || inSta.getBarcode() == 8){ |
|---|
| | | |
|---|
| | | }else { |
|---|
| | | if (taskWrk.getCrnNo() != inSta.getBarcode()){ |
|---|
| | | sign = false; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null && sign){ |
|---|
| | | if ( taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() == workNo ){ |
|---|
| | | continue; |
|---|
| | | } |
|---|
