From 8f5885b9efcc9616733bd69e8c55339d648f9e9e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 09 九月 2024 08:35:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index c4debd3..b37edb4 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.damage.mapper.DamageMapper;
@@ -146,28 +147,44 @@
this.saveBatch(damageList);
}
+ /**
+ * 鎷胯蛋鎵撳嵃鏁版嵁鏌ヨ
+ */
@Override
- public List<Damage> selectDamagePrint(Damage damage) {
- QueryWrapper<Damage> wrapper = new QueryWrapper<>();
- wrapper.select("working_procedure,engineer_id,teams_groups_name,device_name,count(glass_id)as glass_id")
- .eq("type",damage.getType())
- .eq("working_procedure",damage.getWorkingProcedure())
- .groupBy("working_procedure,engineer_id,teams_groups_name,device_name");
- if (damage.getEngineerId() != null) {
- wrapper.eq("engineer_id", damage.getEngineerId());
- }
- return this.list(wrapper);
+ public List<DamagePrint> selectDamagePrint(Damage damage) {
+ MPJQueryWrapper<Damage> listDamage = new MPJQueryWrapper<Damage>()
+ .select("t.engineer_id,t.glass_id,b.tempering_layout_id,b.tempering_feed_sequence,b.width,b.height,b.thickness")
+ .leftJoin("glass_info as b on t.glass_id=b.glass_id")
+ .eq("t.working_procedure", damage.getWorkingProcedure())
+ .eq("t.type", damage.getType());
+ // 鍔ㄦ�佹坊鍔犳潯浠讹紝褰� id 鏈夊�兼椂
+ if (damage.getEngineerId() != null) {
+ listDamage.eq("t.engineer_id", damage.getEngineerId());
+ }
+ return damageMapper.selectJoinList(DamagePrint.class, listDamage);
+ }
+
+ /**
+ * 鎷胯蛋鎵撳嵃鎵撳嵃璇︽儏鏌ヨ
+ */
+ @Override
+ public List<DamagePrint> selectDamagePrintDetails(Damage damage) {
+ List<DamagePrint> listDamage = damageMapper.selectJoinList(DamagePrint.class, new MPJQueryWrapper<Damage>()
+ .select("b.flow_card_id,b.layer,t.engineer_id,b.tempering_layout_id,b.tempering_feed_sequence,t.glass_id,b.width,b.height,b.thickness")
+ .leftJoin("glass_info as b on t.glass_id=b.glass_id")
+ .eq("t.working_procedure", damage.getWorkingProcedure())
+ .eq("t.type", damage.getType())
+ .eq("t.engineer_id", damage.getEngineerId())
+ );
+ return listDamage;
}
@Override
- public List<DamagePrint> selectDamagePrintDetails(Damage damage) {
- List<DamagePrint> listDamage=damageMapper.selectJoinList(DamagePrint.class,new MPJQueryWrapper<Damage>()
- .select("b.flow_card_id,b.layer,t.engineer_id,b.tempering_layout_id,b.tempering_feed_sequence,t.glass_id,b.width,b.height,b.thickness")
- .leftJoin("glass_info as b on t.glass_id=b.glass_id")
- .eq("t.working_procedure",damage.getWorkingProcedure())
- .eq("t.type",damage.getType())
- .eq("t.engineer_id",damage.getEngineerId())
+ public void deleteByGlassId(String glassId) {
+ baseMapper.delete(
+ new LambdaQueryWrapper<Damage>()
+ .eq(Damage::getGlassId, glassId)
+ .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
);
- return listDamage;
}
}
--
Gitblit v1.8.0