From eaf25c57276ebaf28141418199c92e9502884ccf Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 09 三月 2025 23:51:28 +0800
Subject: [PATCH] 1、原片仓储新增任务完成/任务失败接口供用户异常情况恢复处理 2、原片仓储新增历史任务查询按钮 3、卧式理片新增任务完成/任务失败接口供用户异常情况恢复处理 4、大理片笼临时修改:10mm及以上厚度的玻璃走直通任务,厚度可按照实际情况进行配置 5、fixbug:中空理片笼10mm厚度玻璃进入理片笼小格子异常问题查询,同一个流程卡同一层出现2种厚度,导致厚度赋值异常,目前已改为查询最后一次导入的为准

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
index c54fa2b..813c149 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
@@ -27,7 +27,7 @@
 public class DownWorkstationTaskServiceImpl extends ServiceImpl<DownWorkstationTaskMapper, DownWorkstationTask> implements DownWorkstationTaskService {
 
 
-    public void insertdownWorkstationtask(DownGlassInfo downGlassInfo) {
+    public void insertdownWorkstationtask(DownGlassInfo downGlassInfo,String workstationid) {
         DownWorkstationTask entity = new DownWorkstationTask();
         // 鏌ヨ褰撳墠鏈�澶х殑 id 鍊�
         Long maxId = getMaxId();
@@ -38,6 +38,7 @@
         BeanUtils.copyProperties(downGlassInfo,entity);
         entity.setId(newId); // 璁剧疆鎵嬪姩閫掑鐨� id
         entity.setState(1);
+        entity.setWorkstationid(workstationid);
         baseMapper.insert(entity);
     }
 
@@ -66,10 +67,10 @@
     }
 
     @Override
-    public void updateTaskStateToZero(DownWorkstationTask downWorkstationTask) {
+    public void updateTaskState(DownWorkstationTask downWorkstationTask) {
         LambdaUpdateWrapper<DownWorkstationTask> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
 
-        lambdaUpdateWrapper.set(DownWorkstationTask::getState, 0)
+        lambdaUpdateWrapper.set(DownWorkstationTask::getState, 2)
                 .eq(DownWorkstationTask::getGlassId, downWorkstationTask.getGlassId());
 
         baseMapper.update(new DownWorkstationTask(), lambdaUpdateWrapper);

--
Gitblit v1.8.0