From ef9e8df8f911d53d1ec23bf920f1cd5ba8f18e13 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 13 九月 2024 08:04:26 +0800
Subject: [PATCH] 线路配置，打标机前端页面
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 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 1df3131..7edeb9c 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;
@@ -40,6 +41,10 @@
}
+ /**
+ * @param state
+ * @return
+ */
@Override
public boolean updateLoadState(Integer state) {
//鏇存敼鑱旀満鐘舵��
@@ -108,9 +113,9 @@
}
@Override
- public Tasking selectTaskLoad(Tasking tasking) {
+ public Tasking selectTasking(Tasking tasking) {
QueryWrapper<Tasking> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("current_craft",tasking.getGlassId())
+ queryWrapper.eq("current_craft",tasking.getCurrentCraft())
.eq("state",tasking.getState())
.eq("work_state",tasking.getWorkState())
.orderByAsc("glass_id");
@@ -121,4 +126,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