From 489b48ad9fad5ad17106b7e69d778c824df3df9d Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 11 九月 2024 09:14:49 +0800
Subject: [PATCH] 提交合并代码
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 104 insertions(+), 1 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
index 37a8b4f..1df3131 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
@@ -1,11 +1,20 @@
package com.mes.md.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.common.S7object;
+import com.mes.device.PlcParameterObject;
+import com.mes.md.entity.GlassInfo;
import com.mes.md.entity.Tasking;
+import com.mes.md.mapper.GlassInfoMapper;
import com.mes.md.mapper.TaskingMapper;
import com.mes.md.service.TaskingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -17,5 +26,99 @@
*/
@Service
public class TaskingServiceImpl extends MPJBaseServiceImpl<TaskingMapper, Tasking> implements TaskingService {
+ @Resource
+ GlassInfoMapper glassInfoMapper;
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ @Override
+ public boolean updateStatus(Integer state) {
+ //鏇存敼涓婄墖妯″紡
+ //鍚戣澶囧彂閫侀�夋嫨鐨勭姸鎬�
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("Status").getAddress(), state);
+ //鍙戦�佸悗閲嶆柊璇诲彇鍒ゆ柇鏄惁鏇存敼鎴愬姛
+ String loadStatus = plcParameterObject.getPlcParameter("Status").getValue();
+ return state == Integer.parseInt(loadStatus);
+ }
+
+ @Override
+ public boolean updateLoadState(Integer state) {
+ //鏇存敼鑱旀満鐘舵��
+ //鍚戣澶囧彂閫侀�夋嫨鐨勭姸鎬�
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("loadState").getAddress(), state);
+ //鍙戦�佸悗閲嶆柊璇诲彇鍒ゆ柇鏄惁鏇存敼鎴愬姛
+ String loadState = plcParameterObject.getPlcParameter("loadState").getValue();
+ return state == Integer.parseInt(loadState);
+
+ }
+
+ @Override
+ public boolean updateDamage(Tasking tasking) {
+ UpdateWrapper<Tasking> queryWrapper = new UpdateWrapper<>();
+ queryWrapper.eq("glass_id",tasking.getGlassId())
+ .set("work_state",tasking.getWorkState());
+ return this.update(queryWrapper);
+ }
+
+ @Override
+ public List<Tasking> selectTasking() {
+ QueryWrapper<Tasking> queryWrapper = new QueryWrapper<>();
+ queryWrapper.orderByDesc("task_sequence");
+ return list(queryWrapper);
+ }
+
+ @Override
+ public Boolean insertTasking(String status) {
+ Tasking tasking = new Tasking();
+ if(Objects.equals(status, "1")){
+ QueryWrapper <GlassInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("task_type","鏍囧噯")
+ .eq("work_state","宸ヤ綔")
+ .orderByAsc("task_sequence");
+ GlassInfo glassInfo =glassInfoMapper.selectOne(queryWrapper);
+ 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("涓婄墖");
+
+ }
+ }
+ else {
+ tasking.setTaskType("瀹氬埗");
+ tasking.setCurrentCraft("涓婄墖");
+ }
+ return save(tasking);
+ }
+
+ @Override
+ public boolean updateTasking(String scanId) {
+ return false;
+ }
+
+ @Override
+ public Tasking selectTaskLoad(Tasking tasking) {
+ QueryWrapper<Tasking> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("current_craft",tasking.getGlassId())
+ .eq("state",tasking.getState())
+ .eq("work_state",tasking.getWorkState())
+ .orderByAsc("glass_id");
+ return getOne(queryWrapper);
+ }
+
+ @Override
+ public Boolean insertTaskingPro(String tasking) {
+ return null;
+ }
}
--
Gitblit v1.8.0