From 134dce5c589094fdad6c572fd56770922d9692a9 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 10 七月 2025 21:31:59 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index c5bd39a..4f9f19b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.core.common.SnowflakeIdWorker;
+import com.core.common.*;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.*;
@@ -805,7 +802,17 @@
             waitPakin.sync(mat);
             waitPakin.setBatch(matList.getBatch());       //鏈ㄧ缂栫爜  //鎵规  鍞竴鍊�  绠卞彿
             waitPakin.setModel(matList.getModel());       //鍗峰彿  鍞竴鍊�
-            waitPakin.setBrand(param.getBoxType());     //鏈ㄧ绫诲瀷
+            String boxType = param.getBoxType();
+            try{
+                BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+                BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_specs", boxType));
+                if (!Cools.isEmpty(basBoxType)){
+                    boxType = basBoxType.getBoxType();
+                }
+            } catch (Exception e){
+
+            }
+            waitPakin.setBrand(boxType);     //鏈ㄧ绫诲瀷
             waitPakin.setZpallet(param.getBarcode());   //鎵樼洏鐮�
             waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
             waitPakin.setWeight(matList.getWeight());  //鍑�閲�

--
Gitblit v1.9.1