From 490df5d4d92877171076756af73a96dee1fc053f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 25 十二月 2024 16:03:25 +0800
Subject: [PATCH] 数据回传日志记录功能修改
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 a04f9e1..15f267f 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
@@ -191,7 +191,17 @@
*/
@Override
public Tasking startMachineTask(Machine machine, String scan_id) {
- List<Tasking> list=this.findMachineWorkStateTask(machine,"绛夊緟");
+ //List<Tasking> list=this.findMachineWorkStateTask(machine,"绛夊緟");
+ List<Tasking> list=baseMapper.selectJoinList(Tasking.class,new MPJLambdaWrapper<Tasking>()
+ .selectAll(Tasking.class)
+ .innerJoin(LineConfiguration.class,LineConfiguration::getId,Tasking::getLineConfigurationId)
+ .innerJoin(Machine.class,Machine::getId,LineConfiguration::getMachineId)
+ .eq(LineConfiguration::getMachineId,machine.getId())
+ .eq(Tasking::getGlassState,"姝ｅ父")
+ .eq(Tasking::getState,"绾夸笂")
+ .eq(Tasking::getScanId,scan_id)
+ .eq(Tasking::getWorkState,"绛夊緟")
+ .orderByAsc(Tasking::getTaskSequence));
if(!list.isEmpty()){
Tasking tasking=list.get(0);
if(scan_id.equals(tasking.getScanId())){
@@ -512,9 +522,11 @@
List<Tasking> listTasking=baseMapper.selectList(new QueryWrapper<Tasking>().lambda()
.eq(Tasking::getScanId,scanId)
.ne(Tasking::getLineConfigurationId,113)
+ .ne(Tasking::getWorkState,"瀹屽伐")
.ne(Tasking::getState,"绾夸笅")
.ne(Tasking::getGlassState,"鐮存崯"));
- if((listTasking.size()<primitiveTaskList.get(0).getTaskQuantity())||machine.getMode()==3){
+ Machine oneMachine=machineMapper.selectById(1L);
+ if((listTasking.size()<primitiveTaskList.get(0).getTaskQuantity())||oneMachine.getMode()==3){
Tasking tasking=primitiveTaskService.convertListTasking(primitiveTask,lineConfiguration.getId());
Integer taskSequence=1;
if (machine.getTodayCount()>0&&machine.getTodayCount()<5000){
@@ -527,7 +539,9 @@
if (machine.getId()==24){
List<KBBTLensSorting> list=kBBTLensSortingMapper.selectList(new QueryWrapper<KBBTLensSorting>().lambda()
.eq(KBBTLensSorting::getBarcode,scanId)
- .notLike(KBBTLensSorting::getProductionOrder,"闃茬鑶�"));
+ .notLike(KBBTLensSorting::getProductionName,"闃茬鑶�")
+ .notLike(KBBTLensSorting::getProductionName,"纾ㄧ爞")
+ .notLike(KBBTLensSorting::getProductionName,"鍊掕"));
if (list.size()>0){
Warehouse=list.get(0).getWarehouse();
}
--
Gitblit v1.8.0