From 01fa93b5dd9f20286ef8f22515caf55307f76a9d Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs
---
src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
index 0321a08..370e34f 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -36,7 +37,10 @@
}
WrkMastLog mastLog = new WrkMastLog();
BeanUtils.copyProperties(mast, mastLog);
- mastLog.setLogId(mast.getId());
+ if (mast.getWrkSts() != null) {
+ mastLog.setWrkSts(mast.getWrkSts().intValue());
+ }
+ mastLog.setLogId(Long.valueOf(mast.getWrkNo()));
if (!wrkMastLogService.insert(mastLog)) {
throw new CoolException("浠诲姟鏃ュ織淇濆瓨澶辫触锛侊紒");
@@ -55,4 +59,9 @@
return R.ok(page);
}
+ @Override
+ public List<InventoryFlowDto> inventoryFlowAll(Map<String, Object> param) {
+ return this.baseMapper.inventoryFlowAll(param);
+ }
+
}
--
Gitblit v1.9.1