From 7fecdd4f27d9d664cb0de5ee2b1dd7d6bbf9f1d2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 13 九月 2024 08:07:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 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 7edeb9c..582b0ed 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
@@ -10,7 +10,9 @@
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;
@@ -29,6 +31,8 @@
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) {
@@ -109,10 +113,45 @@
@Override
public boolean updateTasking(String scanId) {
- return false;
+ Tasking glass=new Tasking();
+ glass.setCurrentCraft("涓婄墖");
+ glass.setState("瀹屾垚");
+ glass.setTaskType("瀹氬埗");
+ //鑾峰彇褰撳墠涓婄墖鐨勫畾鍒朵换鍔d
+ 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) {
QueryWrapper<Tasking> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("current_craft",tasking.getCurrentCraft())
--
Gitblit v1.8.0