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 |   82 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 81 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 0b83559..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
@@ -3,13 +3,16 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJLambdaQueryWrapper;
 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.GlassInfoService;
 import com.mes.md.service.TaskingService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,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) {
@@ -108,8 +113,43 @@
 
     @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) {
@@ -125,4 +165,44 @@
     public Boolean insertTaskingPro(String tasking) {
         return null;
     }
+
+
+    /**
+     * @param tasking
+     * 鏌ヨ褰撳墠宸ヨ壓锛岀嚎涓婃湭瀹屽伐鐨勪换鍔�
+     * @return
+     */
+    @Override
+    public List<Tasking> findCraftTasking(Tasking tasking) {
+        return baseMapper.selectList(new MPJLambdaQueryWrapper<Tasking>()
+                .selectAll(Tasking.class)
+                .eq(Tasking::getCurrentCraft,tasking.getCurrentCraft())
+                .ne(Tasking::getWorkState,"瀹屽伐")
+                .orderByAsc(Tasking::getGlassId));
+    }
+
+    /**
+     * @param tasking
+     * 淇敼浠诲姟鐘舵�� 銆愮牬鎹�/澶辫触/瀹屽伐銆�
+     * @return
+     */
+    @Override
+    public int updateCraftTasking(Tasking tasking) {
+        Tasking oldTasking=baseMapper.selectById(tasking);
+        oldTasking.setWorkState(tasking.getWorkState());
+        return baseMapper.updateById(oldTasking);
+    }
+
+    /**
+     * @param tasking
+     * 淇敼鐘舵�� 銆愪笅绾裤��
+     * @return
+     */
+    @Override
+    public int updateDownLine(Tasking tasking) {
+        Tasking oldTasking=baseMapper.selectById(tasking);
+        oldTasking.setState(tasking.getState());
+        return baseMapper.updateById(oldTasking);
+    }
+
 }

--
Gitblit v1.8.0