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, 41 insertions(+), 0 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 c0194d0..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,6 +3,7 @@
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;
@@ -164,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