From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:51 +0800
Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase，仅需要有脚本变动的时候开启在执行，避免启动报错 3、原片仓储新增入库请求、出库情况，调整整体逻辑，增加格子号架子号，任务表、详情表、工位表都需要记录架子信息，用于任务执行过程中，架子在执行过程中可返回架子对应的工位上，避免架子乱放后格子架子号不对应的情况发生。
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
index e42cefa..47f829c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
@@ -20,7 +20,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -30,24 +30,25 @@
@DS("pp")
@Slf4j
public class ReportingWorkServiceImpl extends ServiceImpl<ReportingWorkMapper, ReportingWork> implements ReportingWorkService {
-@Autowired
-private ReportingDamageMapper reportingDamageMapper;
-@Autowired
-private AwaitingRepairMapper awaitingRepairMapper;
+ @Autowired
+ private ReportingDamageMapper reportingDamageMapper;
+ @Autowired
+ private AwaitingRepairMapper awaitingRepairMapper;
+
@Override
public List<Reportingdamage> selectDamage(Reportingdamage reportingdamage) {
- QueryWrapper<Reportingdamage>queryWrapper=new QueryWrapper<>();
- queryWrapper.select("this_process,sum(completed_quantity)as completedQuantity,sum(breakage_quantity)as breakageQuantity,device_name ")
- .eq("this_process",reportingdamage.getThisProcess())
+ QueryWrapper<Reportingdamage> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("this_process,sum(completed_quantity) as completedQuantity,sum(breakage_quantity) as breakageQuantity ")
+ //.eq("this_process", reportingdamage.getThisProcess())
//.eq("device_name",reportingdamage.getDeviceName())
- .ge("reporting_work_time",reportingdamage.getReportingWorkTime())
+ .ge("reporting_work_time", reportingdamage.getReportingWorkTime())
.groupBy("this_process");
return reportingDamageMapper.selectList(queryWrapper);
}
@Override
public List<AwaitingRepair> selectAwaitingRepair() {
- QueryWrapper<AwaitingRepair>queryWrapper=new QueryWrapper<>();
+ QueryWrapper<AwaitingRepair> queryWrapper = new QueryWrapper<>();
queryWrapper.select("*");
return awaitingRepairMapper.selectList(queryWrapper);
}
--
Gitblit v1.8.0