From 1c4311135628b53daa336821ff452292a9d063e9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 28 八月 2024 09:14:10 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
index 509dfb2..cce75fb 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
@@ -75,7 +75,13 @@
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsService.getById(list.getMaterialsId());
list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
list.setIsConsume(slGoodsMaterials.getIsConsume());
- list.setErwmNum(slVolumeProductionRkService.getById(list.getScrkId()).getErwmNum());
+ if (list.getScrkId() != null){
+ SlVolumeProductionRk byId = slVolumeProductionRkService.getById(list.getScrkId());
+ if (byId!=null){
+ Integer erwmNum = byId.getErwmNum();
+ list.setErwmNum(erwmNum);
+ }
+ }
}
// 将list2中的数据 如果字段erwmNum为空 优先展示在前面
list2.sort((o1, o2) -> {
@@ -103,7 +109,9 @@
continue;
}
byId1.setErwmNum(updateQrCodeNumDTO.getErwmNum());
- byId1.setRkModel(getLetter(updateQrCodeNumDTO.getErwmNum()));
+ if (byId1.getErwmNum()>0){
+ byId1.setRkModel(getLetter(updateQrCodeNumDTO.getErwmNum()));
+ }
slVolumeProductionRkService.updateById(byId1);
}
--
Gitblit v1.7.1