From fc7b97877ca01587fe4b3e6c7ac2f9f5be8dcc53 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 10 七月 2024 16:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
index 2e6fb71..c77fb1d 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -4,8 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
import com.mes.downglassinfo.entity.DownGlassInfo;
-import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
import com.mes.downglassinfo.service.DownGlassInfoService;
import com.mes.downglassinfo.service.DownGlassTaskService;
@@ -16,6 +17,7 @@
import com.mes.downworkstation.mapper.DownWorkstationTaskMapper;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.downworkstation.service.DownWorkstationTaskService;
+import com.mes.glassinfo.service.GlassInfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,7 +42,10 @@
private DownGlassInfoMapper downGlassInfoMapper;
@Autowired
private DownGlassTaskService downGlassTaskService;
-
+ @Autowired
+ private GlassInfoService glassInfoService;
+ @Autowired
+ private DamageService damageservice;
@Autowired
private DownWorkstationTaskService downWorkstationTaskService;
@@ -53,10 +58,10 @@
@Override
public int getTotalQuantity(int workstationId) {
DownWorkstation result = baseMapper.selectOne(new QueryWrapper<DownWorkstation>().lambda()
- .select(DownWorkstation::getTotalquantity)
+ .select(DownWorkstation::getTotalQuantity)
.eq(DownWorkstation::getWorkstationId, workstationId));
- return result != null ? result.getTotalquantity() : 0;
+ return result != null ? result.getTotalQuantity() : 0;
}
@@ -111,7 +116,7 @@
.eq("workstation_id", workstationId);
DownWorkstation result = baseMapper.selectOne(queryWrapper);
- return result != null ? result.getRacksnumber() : 0;
+ return result != null ? result.getRacksNumber() : 0;
}
//鏍规嵁鏉′欢鑾峰彇宸ヤ綅鐜荤拑淇℃伅
@@ -136,10 +141,17 @@
@Override
- public int updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId,int artificialnumber) {
+ public int updateFlowCardIdAndCount(String flowCardId, int workstationId,int layer) {
+ int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId,layer);
+ QueryWrapper<Damage> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("process_id", flowCardId);
+ queryWrapper.eq("technology_number", layer);
+
+ int artificialnumber=damageservice.count(queryWrapper);
UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("total_quantity", glassInfoCount)
.set("flow_card_id", flowCardId)
+ .set("layer", layer)
.set("artificial_number", artificialnumber)
.eq("workstation_id", workstationId);
--
Gitblit v1.8.0