From 3e8b8d3cb363b2a23e90e7f03e36472bfd27d696 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 10:36:53 +0800
Subject: [PATCH] feat(mes): 补全编号生成规则与条码配置,修正 MPS 下发工单取错编码规则

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
index 5e39c3d..bf0e360 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
@@ -11,7 +11,7 @@
 /**
  * MES 璁惧鍙拌处 Mapper
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Mapper
 public interface MesDvMachineryMapper extends BaseMapperX<MesDvMachineryDO> {
@@ -24,6 +24,8 @@
                 .eqIfPresent(MesDvMachineryDO::getMachineryTypeId, reqVO.getMachineryTypeId())
                 .inIfPresent(MesDvMachineryDO::getMachineryTypeId, reqVO.getMachineryTypeIds())
                 .eqIfPresent(MesDvMachineryDO::getWorkshopId, reqVO.getWorkshopId())
+                .eqIfPresent(MesDvMachineryDO::getWorkstationId, reqVO.getWorkstationId())
+                .eqIfPresent(MesDvMachineryDO::getProcessId, reqVO.getProcessId())
                 .eqIfPresent(MesDvMachineryDO::getStatus, reqVO.getStatus())
                 .orderByDesc(MesDvMachineryDO::getId));
     }

--
Gitblit v1.9.3