| | |
|---|
| | | import com.mes.md.entity.Tasking; |
|---|
| | | import com.mes.md.mapper.GlassInfoMapper; |
|---|
| | | import com.mes.md.mapper.TaskingMapper; |
|---|
| | | import com.mes.md.service.GlassInfoService; |
|---|
| | | import com.mes.md.service.TaskingService; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.stereotype.Service; |
|---|
| | | |
|---|
| | | import javax.annotation.Resource; |
|---|
| | |
|---|
| | | public class TaskingServiceImpl extends MPJBaseServiceImpl<TaskingMapper, Tasking> implements TaskingService { |
|---|
| | | @Resource |
|---|
| | | GlassInfoMapper glassInfoMapper; |
|---|
| | | @Autowired |
|---|
| | | GlassInfoService glassInfoService; |
|---|
| | | PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject; |
|---|
| | | @Override |
|---|
| | | public boolean updateStatus(Integer state) { |
|---|
| | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public boolean updateTasking(String scanId) { |
|---|
| | | return false; |
|---|
| | | Tasking glass=new Tasking(); |
|---|
| | | glass.setCurrentCraft("上片"); |
|---|
| | | glass.setState("完成"); |
|---|
| | | glass.setTaskType("定制"); |
|---|
| | | //获取当前上片的定制任务id |
|---|
| | | Tasking tasking= selectTasking(glass); |
|---|
| | | //获取当前扫描的玻璃数据 |
|---|
| | | GlassInfo glassInfo = glassInfoService.selectTaskingByGlass(scanId); |
|---|
| | | if(glassInfo!=null){ |
|---|
| | | tasking.setBatchNumber(glassInfo.getBatchNumber()); |
|---|
| | | tasking.setScanId(glassInfo.getScanId()); |
|---|
| | | tasking.setProgramId(glassInfo.getProgramId()); |
|---|
| | | tasking.setTaskType(glassInfo.getTaskType()); |
|---|
| | | tasking.setTaskSequence(glassInfo.getTaskSequence()); |
|---|
| | | tasking.setTaskQuantity(glassInfo.getTaskQuantity()); |
|---|
| | | tasking.setLength(glassInfo.getLength()); |
|---|
| | | tasking.setWidth(glassInfo.getWidth()); |
|---|
| | | tasking.setThickness(glassInfo.getThickness()); |
|---|
| | | tasking.setDrawingGlue(glassInfo.getDrawingGlue()); |
|---|
| | | tasking.setDrawingMarking(glassInfo.getDrawingMarking()); |
|---|
| | | tasking.setSilkScreenX(glassInfo.getSilkScreenX()); |
|---|
| | | tasking.setSilkScreenY(glassInfo.getSilkScreenY()); |
|---|
| | | tasking.setIsMarking(glassInfo.getIsMarking()); |
|---|
| | | tasking.setIsSilkScreen(glassInfo.getIsSilkScreen()); |
|---|
| | | tasking.setCurrentCraft("扫码"); |
|---|
| | | } |
|---|
| | | return updateById(tasking); |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public boolean updateTaskingState(Tasking tasking) { |
|---|
| | | UpdateWrapper<Tasking>wrapper=new UpdateWrapper<>(); |
|---|
| | | wrapper.eq("scan_id",tasking.getScanId()); |
|---|
| | | return update(tasking,wrapper); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public Tasking selectTasking(Tasking tasking) { |
|---|
