From 2c2413760b6467bf62402dba7338bd3bbcbd7341 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 20 五月 2025 14:20:38 +0800
Subject: [PATCH] 添加产量报表功能页面
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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..68cd9ce 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())){
@@ -228,6 +238,7 @@
.eq(Tasking::getScanId,scan_id)
.eq(Tasking::getGlassState,"姝ｅ父")
.eq(Tasking::getState,"绾夸笂")
+ .ne(Tasking::getWorkState,"瀹屽伐")
.le(LineConfiguration::getProcessSequence,machineLineConfiguration.get(0).getProcessSequence())
.orderByAsc(Tasking::getTaskSequence));
if(!list.isEmpty()){
@@ -315,11 +326,12 @@
@Override
public int finishMachineTask(Machine machine) {
List<Tasking> list=this.findMachineWorkStateTask(machine,"姝ｅ湪宸ヤ綔");
- //褰撳墠璁惧鐨勭嚎璺厤缃�
+ //鏌ヨ褰撳墠璁惧绾胯矾閰嶇疆
List<LineConfiguration> machineLineConfiguration=lineConfigurationMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
.selectAll(LineConfiguration.class)
.eq(LineConfiguration::getMachineId,machine.getId()));
if(!machineLineConfiguration.isEmpty()){
+ //褰撳墠璁惧瀛樺湪绾胯矾閰嶇疆锛屾煡璇㈠綋鍓嶈澶� 鍦ㄧ嚎璺厤缃〃涓殑涓嬩竴璁惧
List<LineConfiguration> listLineConfiguration=lineConfigurationMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
.selectAll(LineConfiguration.class)
.eq(LineConfiguration::getLineId,machineLineConfiguration.get(0).getLineId())
@@ -328,12 +340,16 @@
.orderByAsc(LineConfiguration::getProcessSequence)
.orderByAsc(LineConfiguration::getPrioritySequence)
);
+
if(!list.isEmpty()){
+ //鏍囪浠诲姟鐘舵��
Tasking tasking=list.get(0);
LineConfiguration thisLineConfiguration=lineConfigurationMapper.selectById(tasking.getLineConfigurationId());
tasking.setOperationRecord(thisLineConfiguration.getRemark()+thisLineConfiguration.getLineId());
tasking.setOperationRecordTime(new Date());
tasking.setOperationMode("缁撴潫");
+ //listLineConfiguration涓嶆槸绌�,琛ㄧず褰撳墠璁惧閰嶇疆鍏崇郴涓湁涓嬩竴璁惧
+ // 鍚﹀垯琛ㄧず鏃犱笅涓�宸ュ簭锛屽嵆褰撳墠宸ュ簭涓烘渶鍚庝竴宸ュ簭 鏍囪鐘舵�佸畬宸�
if (!listLineConfiguration.isEmpty()){
tasking.setLineConfigurationId(listLineConfiguration.get(0).getId());
tasking.setWorkState("绛夊緟");
@@ -342,7 +358,6 @@
else{
tasking.setWorkState("瀹屽伐");
return baseMapper.updateById(tasking);
- //return this.stopTasking(tasking);
}
}
@@ -512,9 +527,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 +544,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