From 190116c4257751cc6e7de07a6f211f525ba5d2cc Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 10 Dec 2024 16:52:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=95=E8=80=97=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../op/energy/report/domain/ReportOrderEnergyDTO.java | 9 +++++++++
.../resources/mapper/report/ReportPointDnbMapper.xml | 4 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java b/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java
index e89123113..f3334a132 100644
--- a/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java
+++ b/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java
@@ -36,6 +36,15 @@ public class ReportOrderEnergyDTO extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endWorkTime;
private String workorderCodeSap;
+ private String workTime;
+
+ public String getWorkTime() {
+ return workTime;
+ }
+
+ public void setWorkTime(String workTime) {
+ this.workTime = workTime;
+ }
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
index 937d6ca0d..cdda26d6c 100644
--- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
+++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
@@ -54,6 +54,7 @@
+
@@ -275,13 +276,14 @@
bpa.category,
mrw_summary.total_quantity_feedback,
mrw_summary.create_by as line_leader,
+ mrw_summary.work_time,
pow.start_work_time,
pow.end_work_time,
be.attr2 AS electricity_no
FROM
pro_order_workorder pow
LEFT JOIN base_equipment be ON pow.workorder_name = be.equipment_code
- LEFT JOIN ( SELECT workorder_code, create_by, SUM ( quantity_feedback ) AS total_quantity_feedback FROM mes_report_work GROUP BY workorder_code, create_by ) mrw_summary ON pow.workorder_code = mrw_summary.workorder_code
+ LEFT JOIN ( SELECT workorder_code, create_by, SUM ( quantity_feedback ) AS total_quantity_feedback,SUM ( work_time ) as work_time FROM mes_report_work GROUP BY workorder_code, create_by ) mrw_summary ON pow.workorder_code = mrw_summary.workorder_code
LEFT JOIN base_product_attached bpa ON bpa.product_code = RIGHT ( pow.product_code, 11 )
LEFT JOIN base_product bp ON bp.product_code = pow.product_code
From e1806718aea83240ef0b6c1a981fea6c59a4afcd Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 11 Dec 2024 10:20:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?wms=E8=B4=A8=E6=A3=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/op/wms/service/impl/OdsProcureOrderServiceImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
index cc2bd7cf3..6677cc510 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
@@ -2911,7 +2911,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
qcCheckTaskIncomeDTO.setMaterialCode(order1.getMaterialCode());
qcCheckTaskIncomeDTO.setMaterialName(order1.getMaterialDesc());
// qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2());
- qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode());
+
+ qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()+order1.getUserDefined11().replace("-", ""));
qcCheckTaskIncomeDTO.setIncomeTime(new Date());
R ruslt= remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);
// 成功后修改--
From 1e95415fa88e78b0d20fb0e768d075ca4f381020 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 11 Dec 2024 10:23:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?wms=E8=B4=A8=E6=A3=80=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/op/wms/service/impl/OdsProcureOrderServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
index 6677cc510..86290bb79 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
@@ -2912,7 +2912,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
qcCheckTaskIncomeDTO.setMaterialName(order1.getMaterialDesc());
// qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2());
- qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()+order1.getUserDefined11().replace("-", ""));
+ qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()+order1.getUserDefined7());
qcCheckTaskIncomeDTO.setIncomeTime(new Date());
R ruslt= remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);
// 成功后修改--