From e4a7d5239f176c5cf5ba95b52c88366908d2ecfa Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期三, 16 七月 2025 15:30:00 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 6f8e37e..746719b 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,13 +802,24 @@
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()); //鍑�閲�
waitPakin.setVolume(matList.getRoughWeight()); //姣涢噸
waitPakin.setPrice(matList.getRollExtent()); //闀垮害
waitPakin.setSpecs(String.valueOf(matList.getJoint())); //鎺ュご
+ waitPakin.setDanger(matList.getQualified()); //寰呭垽
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
@@ -980,7 +988,7 @@
throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode());
}
- wrkMastMatrix.setSheetNo("2");
+ wrkMastMatrix.setSheetNo("3");
if (!wrkMastService.updateById(wrkMastMatrix)){
throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟墭鎷嗗灈瀹屾垚閫氱煡");
}
--
Gitblit v1.9.1