From 6df2d854ea7d8b0d8200dd6572f1c3b5aabecc16 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 27 四月 2026 13:36:29 +0800
Subject: [PATCH] feat(productionPrintOrderExcel) 生产工单查询添加排序
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 4 ++--
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 4 ++--
2 files changed, 4 insertions(+), 4 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 5f5e3c9..ef69ff5 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(dto.getDeviceId());
+ productionProductMain.setDeviceName(dto.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 72f848f..7e16334 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -51,11 +51,11 @@
<if test="c.auditStatus != null">
and ppm.audit_status = #{c.auditStatus}
</if>
- <if test="c.workOrderId != ''">
+ <if test="c.workOrderId != null">
and ppm.work_order_id = #{c.workOrderId}
</if>
</where>
- order by pwo.id desc, ppm.id asc
+ order by ppm.id desc
</select>
<select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
--
Gitblit v1.9.3