From c30ac5918122426ea7a33dbe411aa39b3c7aa2ca Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 27 四月 2026 13:17:36 +0800
Subject: [PATCH] feat(productionPrintOrderExcel) excel导出
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 4 ++--
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 31f8e77..5f5e3c9 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -167,8 +167,8 @@
productionProductMain.setStartTime(productWorkOrder.getStartProductTime());
productionProductMain.setEndTime(now);
}
- productionProductMain.setDeviceId(productProcess.getDeviceId());
- productionProductMain.setDeviceName(productProcess.getDeviceName());
+// productionProductMain.setDeviceId(productProcess.getDeviceId());
+// productionProductMain.setDeviceName(productProcess.getDeviceName());
productionProductMainMapper.insert(productionProductMain);
/*鏂板鎶ュ伐鎶曞叆琛�*/
List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomAndProcess(productProcessRoute.getBomId(), productProcess.getId());
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index d363dde..72f848f 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -55,7 +55,7 @@
and ppm.work_order_id = #{c.workOrderId}
</if>
</where>
- order by ppm.id
+ order by pwo.id desc, ppm.id asc
</select>
<select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
--
Gitblit v1.9.3