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/pro/workorder/MesProWorkOrderMapper.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java
index 5c94ad9..e619d1d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java
@@ -33,6 +33,8 @@
.likeIfPresent(MesProWorkOrderDO::getOrderSourceCode, reqVO.getOrderSourceCode())
.eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId())
.eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId())
+ .eqIfPresent(MesProWorkOrderDO::getFactoryId, reqVO.getFactoryId())
+ .eqIfPresent(MesProWorkOrderDO::getWorkshopId, reqVO.getWorkshopId())
.eqIfPresent(MesProWorkOrderDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate())
.orderByDesc(MesProWorkOrderDO::getId));
@@ -49,6 +51,8 @@
.likeIfPresent(MesProWorkOrderDO::getOrderSourceCode, reqVO.getOrderSourceCode())
.eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId())
.eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId())
+ .eqIfPresent(MesProWorkOrderDO::getFactoryId, reqVO.getFactoryId())
+ .eqIfPresent(MesProWorkOrderDO::getWorkshopId, reqVO.getWorkshopId())
.eqIfPresent(MesProWorkOrderDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate())
.orderByDesc(MesProWorkOrderDO::getId);
--
Gitblit v1.9.3