From 814d89eefddf8209b5699af6548b643d5cad11ab Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Thu, 4 Jun 2026 19:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/mapper/StStockInoutRecordMapper.java  |  2 ++
 .../wms/mapper/StStockInoutRecordMapper.xml   |  7 ++++++
 .../service/impl/StBuyOrderServiceImpl.java   | 22 +++++++++----------
 .../impl/StOtherReceiptRecordServiceImpl.java | 10 ++++++---
 .../impl/StStockInoutRecordServiceImpl.java   | 13 +++++++++++
 5 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStockInoutRecordMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStockInoutRecordMapper.java
index 020f28dd7..b9d2c8421 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStockInoutRecordMapper.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStockInoutRecordMapper.java
@@ -47,5 +47,7 @@ public interface StStockInoutRecordMapper extends BaseMapper<StStockInoutRecord>
     String getMaxPiNo(String format);
 
 	String getTeamSetByUserId(Long picker);
+
+	int getMaxSerialNoByDate(String dateTime);
 }
 
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStockInoutRecordMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStockInoutRecordMapper.xml
index 2b07060e5..f13f0be0c 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStockInoutRecordMapper.xml
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStockInoutRecordMapper.xml
@@ -174,6 +174,13 @@
             USER_ID
     </select>
 
+    <select id="getMaxSerialNoByDate" resultType="java.lang.Integer">
+        SELECT NVL(MAX(TO_NUMBER(SUBSTR(SIR_CODE, 13, 4))), 0) + 1
+        FROM ST_STOCK_INOUT_RECORD
+        WHERE SIR_CODE LIKE CONCAT('CK', #{dateTime}, '%')
+            FOR UPDATE
+    </select>
+
     <select id="exportStStockInoutRecord" resultType="org.springblade.wms.excel.StStockInoutRecordExcel">
         SELECT * FROM ST_STOCK_INOUT_RECORD ${ew.customSqlSegment}
     </select>
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
index d9cd2fc67..ff9938de5 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.common.exception.BusinessException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
@@ -209,17 +208,16 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 		}
 
 		// 3. 玻璃物料发送校验
-		for (StBuyOrder buyOrder : list) {
-			StGoods goods = stGoodsService.getById(buyOrder.getGoodsId());
-			if (buyOrder.getGoodsId() != null && StrUtil.contains(goods.getGoodsName(), "玻璃")) {
-				try {
-					erpDataWmsClient.sendRbfirtChk(goods.getGoodsCode(), goods.getGoodsName());
-				} catch (BusinessException e) {
-					throw new RuntimeException("玻璃粉验证通知单发送失败：" + e.getMessage());
-				}
-
-			}
-		}
+//		for (StBuyOrder buyOrder : list) {
+//			StGoods goods = stGoodsService.getById(buyOrder.getGoodsId());
+//			if (buyOrder.getGoodsId() != null && StrUtil.contains(goods.getGoodsName(), "玻璃")) {
+//				try {
+//					erpDataWmsClient.sendRbfirtChk(goods.getGoodsCode(), goods.getGoodsName());
+//				} catch (BusinessException e) {
+//					throw new RuntimeException("玻璃粉验证通知单发送失败：" + e.getMessage());
+//				}
+//			}
+//		}
 	}
 
 	@Override
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java
index 306b3aa0d..ed0bef5a4 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java
@@ -160,8 +160,10 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 //			detail.setSirMoney(detail.getUnitPrice() * detail.getQuantity());
 			detail.setUnitPrice(detail.getUnitPrice());
 			detail.setSirMoney(detail.getSirMoney());
-			detail.setDeptId(AuthUtil.getUser().getDeptId());
-			detail.setCreateUser(AuthUtil.getUser().getUserId());
+			if (AuthUtil.getUser() != null) {
+				detail.setDeptId(AuthUtil.getUser().getDeptId());
+				detail.setCreateUser(AuthUtil.getUser().getUserId());
+			}
 			detail.setCreateTime(new Date());
 			detail.setInOutType(StStockInoutRecord.IN_TYPE);
 			detail.setInOutReason(String.valueOf(stOtherReceiptRecord.getWarehousingReason()));
@@ -181,7 +183,9 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 			newReceipt.setShId(stOtherReceiptRecord.getShId());
 			newReceipt.setWarehousingReason(stOtherReceiptRecord.getWarehousingReason());
 			newReceipt.setMemo(stOtherReceiptRecord.getMemo());
-			newReceipt.setCreateUser(AuthUtil.getUser().getUserId());
+			if (AuthUtil.getUser() != null) {
+				newReceipt.setCreateUser(AuthUtil.getUser().getUserId());
+			}
 			newReceipt.setCreateTime(new Date());
 			// 关联当前明细的ID（核心：一一对应）
 			newReceipt.setSirId(detail.getId());
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStockInoutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStockInoutRecordServiceImpl.java
index fab804d9f..b46228b3a 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStockInoutRecordServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStockInoutRecordServiceImpl.java
@@ -100,6 +100,19 @@ public class StStockInoutRecordServiceImpl extends BaseServiceImpl<StStockInoutR
 		return datePrefix + StrUtil.padPre(String.valueOf(++lastNum), 4, '0');
 	}
 
+//	@Override
+//	@Transactional
+//	public String makeCode() {
+//		// 时间格式：yyMMddHHmmss（2位年+月+日+时+分+秒）
+//		String dateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmmss"));
+//		// 获取下一个流水号
+//		int serialNo = baseMapper.getMaxSerialNoByDate(dateTime);
+//		// 拼接最终单号：CK + 时间 + 4位流水号（前面补0）
+//		String sirCode = "CK" + dateTime + String.format("%04d", serialNo);
+//
+//		return sirCode;
+//	}
+
 	@Override
 	public String getMaxPiNo(String typeCode) {
 		String datePrefix = DateUtil.format(new Date(), "yyyyMMdd");