*

L

2025-07-10 134dce5c589094fdad6c572fd56770922d9692a9

*

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -18,6 +18,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@Data
@TableName("asr_loc_detl")
@@ -237,8 +238,8 @@

    public String getBrand$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
        if (!Cools.isEmpty(basBoxType)){
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return this.brand;

 src/main/java/com/zy/asrs/entity/OrderDetl.java

@@ -19,6 +19,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@Data
@TableName("man_order_detl")
@@ -495,8 +496,8 @@

    public String getBrand$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
        if (!Cools.isEmpty(basBoxType)){
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return this.brand;

 src/main/java/com/zy/asrs/entity/WaitPakin.java

@@ -13,6 +13,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@Data
@TableName("cust_wait_pakin")
@@ -244,8 +245,8 @@

    public String getBrand$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
        if (!Cools.isEmpty(basBoxType)){
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return this.brand;

 src/main/java/com/zy/asrs/entity/WaitPakinLog.java

@@ -12,6 +12,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@Data
@TableName("cust_wait_pakin_log")
@@ -227,8 +228,8 @@

    public String getBrand$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
        if (!Cools.isEmpty(basBoxType)){
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return this.brand;

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -15,6 +15,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@Data
@TableName("asr_wrk_detl")
@@ -390,8 +391,8 @@

    public String getBrand$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
        if (!Cools.isEmpty(basBoxType)){
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return this.brand;

 src/main/java/com/zy/asrs/entity/WrkDetlLog.java

@@ -14,6 +14,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@Data
@TableName("asr_wrk_detl_log")
@@ -388,8 +389,8 @@

    public String getBrand$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
        if (!Cools.isEmpty(basBoxType)){
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return this.brand;

 src/main/java/com/zy/asrs/entity/WrkDetlSingle.java

@@ -23,6 +23,7 @@
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
import java.util.List;

@Data
@TableName("asr_wrk_detl_single")
@@ -469,8 +470,8 @@

    public String getBrand$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
        if (!Cools.isEmpty(basBoxType)){
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return this.brand;

 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());  //净重