*

L

6 天以前 e4a7d5239f176c5cf5ba95b52c88366908d2ecfa

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