From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java b/inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java
index c0dcab8..a1b7a3e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.common.numgen.NumberGenerator;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.api.MesApiUtils;
import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
import com.ruoyi.inspect.service.IfsSplitOrderRecordService;
@@ -33,7 +34,7 @@
@Autowired
private MesApiUtils mesApiUtils;
- private final static String LOCATION_NO = "WG-02-001";//mes澶栬喘鍚堟牸搴撲綅
+ public final static String LOCATION_NO = "WG-02-001";//mes澶栬喘鍚堟牸搴撲綅
@Autowired
private NumberGenerator<IfsSplitOrderRecord> splitOrderRecordNumberGenerator;
@@ -67,7 +68,7 @@
//浣跨敤鐩稿悓鐨勭郴缁熺紪鍙�
one.setSystemNo(quantityList.get(0).getSystemNo());
}
- if(Objects.isNull(one.getSystemNo())){
+ if(StringUtils.isBlank(one.getSystemNo())){
one.setSystemNo(splitOrderRecordNumberGenerator.generateNumberWithPrefix(IfsSplitOrderRecord.DIGIT,IfsSplitOrderRecord.PREFIX,IfsSplitOrderRecord::getSystemNo));
}
//鍚屾MES瀹炴椂搴撳瓨
--
Gitblit v1.9.3