*

lsh

1 天以前 bd1744487c58d169a0c8ceca982d1c5ae07dbce6

 src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java

@@ -4,10 +4,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SpringUtils;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
@@ -136,7 +133,7 @@
                        continue;
//                        throw new CoolException("箱号："+outLocBoxC[0]+" 未查询到数据！！！");
                    }
                    if (locDetlSou.getDanger$().equals(outLocBoxC[4])){
                    if (!locDetlSou.getDanger$().equals(outLocBoxC[4])){
                        sign = false;
                        errorMsgOrderLoc = errorMsgOrderLoc + "[===》" +"箱号："+outLocBoxC[0]+" ==》出库输入待判状态："+outLocBoxC[4]+"、库存状态："+locDetlSou.getDanger$()+"。状态不匹配《===]";
                        continue;
@@ -194,7 +191,13 @@
//                        locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
//                locDto.setOrigin(locDetl.getOrigin());
//                locDto.setWeight(locDetl.getWeight());
                locDetl.setMemo(outLocBoxC[3]);

                if (!Cools.isEmpty(outLocBoxC[3])){
                    String memo = Cools.isEmpty(locDetl.getMemo())?  "" : locDetl.getMemo()+"，";
                    locDetl.setMemo(memo + DateUtils.convert(new Date(), DateUtils.yyyyMMdd_C)+"手动输入备注：" + outLocBoxC[3]);
                } else if (Cools.isEmpty(locDetl.getMemo())){
                    locDetl.setMemo(outLocBoxC[3]);
                }
                LocDto locDto = new LocDto(locDetl);
                locDtos.add(locDto);
            }
@@ -222,6 +225,7 @@
                locDetl.setOrigin(locDto.getOrigin());
                locDetl.setWeight(locDto.getWeight());
                locDetl.setMemo(locDto.getMemo());
                locDetl.setDanger(locDto.getDanger());

                locDetls.add(locDetl);
            }