From d42f9256b4aab375b6c7897e11e99f07bf5f9c95 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 七月 2026 10:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 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 e9352b8..abeedfd 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
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -9,6 +10,7 @@
import org.apache.ibatis.annotations.Mapper;
import java.math.BigDecimal;
+import java.util.List;
/**
* MES 鐢熶骇宸ュ崟 Mapper
@@ -31,6 +33,31 @@
.orderByDesc(MesProWorkOrderDO::getId));
}
+ /**
+ * 鍒嗛〉鏌ヨ锛堝甫瀹㈡埛鏉冮檺杩囨护锛�
+ */
+ default PageResult<MesProWorkOrderDO> selectPage(MesProWorkOrderPageReqVO reqVO, List<Long> permittedClientIds) {
+ LambdaQueryWrapperX<MesProWorkOrderDO> wrapper = new LambdaQueryWrapperX<MesProWorkOrderDO>()
+ .likeIfPresent(MesProWorkOrderDO::getCode, reqVO.getCode())
+ .likeIfPresent(MesProWorkOrderDO::getName, reqVO.getName())
+ .eqIfPresent(MesProWorkOrderDO::getType, reqVO.getType())
+ .likeIfPresent(MesProWorkOrderDO::getOrderSourceCode, reqVO.getOrderSourceCode())
+ .eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId())
+ .eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId())
+ .eqIfPresent(MesProWorkOrderDO::getStatus, reqVO.getStatus())
+ .betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate())
+ .orderByDesc(MesProWorkOrderDO::getId);
+ if (permittedClientIds != null) {
+ if (CollUtil.isEmpty(permittedClientIds)) {
+ return PageResult.empty();
+ }
+ // 鍏佽 client_id 涓虹┖鐨勮褰曪紙鏃犲鎴峰伐鍗曞鎵�鏈夋湁鏉冮檺鐢ㄦ埛鍙锛�
+ wrapper.and(w -> w.in(MesProWorkOrderDO::getClientId, permittedClientIds)
+ .or().isNull(MesProWorkOrderDO::getClientId));
+ }
+ return selectPage(reqVO, wrapper);
+ }
+
default MesProWorkOrderDO selectByCode(String code) {
return selectOne(MesProWorkOrderDO::getCode, code);
}
@@ -41,6 +68,18 @@
.setSql("quantity_produced = IFNULL(quantity_produced, 0) + " + incrQuantityProduced));
}
+ /**
+ * 绱姞宸ュ崟鐨勫凡鎺掍骇鏁伴噺
+ *
+ * @param id 宸ュ崟缂栧彿
+ * @param incrQuantityScheduled 鏈鎺掍骇鏁伴噺澧為噺
+ */
+ default void updateScheduledQuantity(Long id, BigDecimal incrQuantityScheduled) {
+ update(null, new LambdaUpdateWrapper<MesProWorkOrderDO>()
+ .eq(MesProWorkOrderDO::getId, id)
+ .setSql("quantity_scheduled = IFNULL(quantity_scheduled, 0) + " + incrQuantityScheduled));
+ }
+
default Long selectCountByVendorId(Long vendorId) {
return selectCount(MesProWorkOrderDO::getVendorId, vendorId);
}
--
Gitblit v1.9.3