BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 959b3c7a18b5113425051d437aa6d792faf7f165

Authored by YunaiV
1 parent 39832126

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

refactor(framework): 优化 ObjectUtils 工具类
Inline Side-by-side
Showing 3 changed files with 6 additions and 5 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java
  View file @959b3c7
... ... @@ -60,6 +60,11 @@ public class ObjectUtils {
60 60 return Arrays.asList(array).contains(obj);
61 61 }
62 62  
  63 + @SafeVarargs
  64 + public static <T> boolean notEqualsAny(T obj, T... array) {
  65 + return !Arrays.asList(array).contains(obj);
  66 + }
  67 +
63 68 public static boolean isNotAllEmpty(Object... objs) {
64 69 return !ObjectUtil.isAllEmpty(objs);
65 70 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
  View file @959b3c7
... ... @@ -171,7 +171,6 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
171 171 // 校验存在
172 172 MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
173 173 // 已完成和已取消不允许取消
174   - // TODO DONE @芋艿：确认只有已完成和已取消 2 个状态不允许取消
175 174 if (ObjectUtils.equalsAny(receipt.getStatus(),
176 175 MesWmItemReceiptStatusEnum.FINISHED.getStatus(),
177 176 MesWmItemReceiptStatusEnum.CANCELED.getStatus())) {
... ... @@ -185,9 +184,7 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
185 184 @Override
186 185 public MesWmItemReceiptDO validateItemReceiptEditable(Long id) {
187 186 MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
188   - // TODO DONE @AI：已使用 ObjectUtils.equalsAny 简化多值判断，方法已迁移到 Service 层
189   - // TODO @AI：ObjectUtils 封装一个方法，避免取反；脑子理解起来麻烦
190   - if (!ObjectUtils.equalsAny(receipt.getStatus(),
  187 + if (ObjectUtils.notEqualsAny(receipt.getStatus(),
191 188 MesWmItemReceiptStatusEnum.PREPARE.getStatus(),
192 189 MesWmItemReceiptStatusEnum.APPROVING.getStatus())) {
193 190 throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE);
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
  View file @959b3c7
... ... @@ -118,7 +118,6 @@ public class MesWmMaterialStockServiceImpl implements MesWmMaterialStockService
118 118  
119 119 // 2a. 存在则增加数量
120 120 if (stock != null) {
121   - // TODO DONE @AI：已在 Mapper 新增 incrQuantityOnhand 方法，使用 SQL 原子更新避免并发问题
122 121 materialStockMapper.incrQuantityOnhand(stock.getId(), quantity);
123 122 return;
124 123 }
... ...