From 4a2408cf21e1c60196d798ab971f00328d9ca249 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 四月 2025 16:20:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java |    2 +-
 rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java                 |   20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java
index c0345a7..3a5f542 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java
@@ -106,7 +106,7 @@
     @PostMapping("/asnOrderItemLog/export")
     public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
         LambdaQueryWrapper<AsnOrderItemLog> itemLogLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        itemLogLambdaQueryWrapper.like(AsnOrderItemLog::getLogId, map.get("logId"));
+        itemLogLambdaQueryWrapper.eq(AsnOrderItemLog::getLogId, map.get("logId"));
         List<AsnOrderItemLog> list = asnOrderItemLogService.list(itemLogLambdaQueryWrapper);
         ExcelUtil.build(ExcelUtil.create(list, AsnOrderItemLog.class), response);
     }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
index 901ed35..54bbc4a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.server.system.service.DictDataService;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -159,18 +162,13 @@
 
     public String getWkType$(){
         if (null == this.wkType){ return null; }
-        switch (this.wkType){
-            case "1":
-                return " 甯搁噺";
-            case  "2":
-                return " 娴佹按鍙�";
-            case  "3":
-                return " 鏃ユ湡";
-            case  "4":
-                return " 涓氬姟瀛楁 ";
-            default:
-                return String.valueOf(this.wkType);
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode,"sys_rule_item_type").eq(DictData::getValue, this.wkType));
+        if (null != dictData){
+            return dictData.getLabel();
         }
+        return String.valueOf(this.wkType);
     }
 
     public String getStatus$(){

--
Gitblit v1.9.1