From e529b1dd89b5f2927457a284e660d489b9aa8cc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 01 四月 2026 11:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

---
 src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 9382134..56c339b 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -114,6 +114,7 @@
             List<ProductModel> waitToSaveList = new ArrayList<>();
             int skipCount = 0;
 
+            System.out.println(productModelList);
             for (int i = 0; i < productModelList.size(); i++) {
                 ProductModel item = productModelList.get(i);
                 int rowNum = i + 2;
@@ -124,6 +125,9 @@
                 if (StringUtils.isEmpty(item.getUnit())) {
                     return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [鍗曚綅] 涓嶈兘涓虹┖");
                 }
+                if (StringUtils.isEmpty(item.getUidNo())) {
+                    return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [UID鐮乚 涓嶈兘涓虹┖");
+                }
 
                 //  鍘婚噸,濡傛灉宸插寘鍚鍨嬪彿,鍒欒烦杩�
                 if (existingModelNames.contains(item.getModel())) {

--
Gitblit v1.9.3