gitee/ruoyi-vue-pro
1
0
Fork 0
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git synced 2026-03-22 05:07:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(mes): 优化弹窗标题显示

Browse Source 
refactor(framework): 优化 ObjectUtils 工具类
This commit is contained in:
YunaiV
2026-02-26 01:44:00 +08:00
parent 3983212684
commit 959b3c7a18
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java
View File

@@ -60,6 +60,11 @@ public class ObjectUtils {
return Arrays.asList(array).contains(obj);
}
@SafeVarargs
public static <T> boolean notEqualsAny(T obj, T... array) {
return !Arrays.asList(array).contains(obj);
}
public static boolean isNotAllEmpty(Object... objs) {
return !ObjectUtil.isAllEmpty(objs);
}

5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
View File

@@ -171,7 +171,6 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
// 校验存在
MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
// 已完成和已取消不允许取消
// TODO DONE @芋艿：确认只有已完成和已取消 2 个状态不允许取消
if (ObjectUtils.equalsAny(receipt.getStatus(),
MesWmItemReceiptStatusEnum.FINISHED.getStatus(),
MesWmItemReceiptStatusEnum.CANCELED.getStatus())) {
@@ -185,9 +184,7 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
@Override
public MesWmItemReceiptDO validateItemReceiptEditable(Long id) {
MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
// TODO DONE @AI：已使用 ObjectUtils.equalsAny 简化多值判断，方法已迁移到 Service 层
// TODO @AI：ObjectUtils 封装一个方法，避免取反；脑子理解起来麻烦
if (!ObjectUtils.equalsAny(receipt.getStatus(),
if (ObjectUtils.notEqualsAny(receipt.getStatus(),
MesWmItemReceiptStatusEnum.PREPARE.getStatus(),
MesWmItemReceiptStatusEnum.APPROVING.getStatus())) {
throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE);

1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
View File

@@ -118,7 +118,6 @@ public class MesWmMaterialStockServiceImpl implements MesWmMaterialStockService
// 2a. 存在则增加数量
if (stock != null) {
// TODO DONE @AI：已在 Mapper 新增 incrQuantityOnhand 方法，使用 SQL 原子更新避免并发问题
materialStockMapper.incrQuantityOnhand(stock.getId(), quantity);
return;
}