From bb923868d80b31d1057424a28b4bd7709c5a6648 Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期四, 11 九月 2025 17:57:57 +0800
Subject: [PATCH] feat(cms): - 在`CuttingInventoryServiceImpl`中添加了批量更新库存状态的方法,并添加了事务注解。 - 在`CuttingReceive`实体类中添加了领用单对库存状态变化功能 - 在`CuttingReceiveController`中添加了提交领用单的方法,并优化了部分方法的参数和逻辑。 - 在`CuttingReceiveDetailMapper.xml`中添加了库存ID字段,以让数据库能正常获取库存id。 - 在`CuttingReceiveServiceImpl`中实现了提交领用单的逻辑,并添加了日志记录。- 在`ICuttingInventoryService`接口中添加了批量更新库存状态的方法。 - 在`ICuttingReceiveService`接口中添加了提交领用单的方法。

---
 src/main/java/org/jeecg/modules/cms/entity/CuttingReceive.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/cms/entity/CuttingReceive.java b/src/main/java/org/jeecg/modules/cms/entity/CuttingReceive.java
index dba3e42..d362d02 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/CuttingReceive.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/CuttingReceive.java
@@ -4,10 +4,8 @@
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.common.constant.CommonConstant;
@@ -61,6 +59,7 @@
 	/**棰嗙敤鍗曠姸鎬�*/
 	@Excel(name = "棰嗙敤鍗曠姸鎬�", width = 15)
     @ApiModelProperty(value = "棰嗙敤鍗曠姸鎬�")
+    @Dict(dicCode = "order_status")
     private String orderStatus;
 	/**棰嗙敤浜�*/
 	@Excel(name = "棰嗙敤浜�", width = 15)
@@ -121,4 +120,5 @@
 	@Excel(name = "褰掕繕纭鎰忚", width = 15)
     @ApiModelProperty(value = "褰掕繕纭鎰忚")
     private String returnConfirmComment;
+
 }

--
Gitblit v1.9.3