#

lsh

2024-07-03 b9068e2a764816ea72d85ec9c423c79f7896d4c4

#

 src/main/java/com/zy/asrs/controller/MatController.java

@@ -18,6 +18,7 @@
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.asrs.utils.OutLocBoxExcelListener;
import com.zy.asrs.utils.OutpandianBoxExeclListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.entity.MatExcel;
@@ -385,8 +386,8 @@
    @ManagerAuth(memo = "导入箱号盘点出库")
    @Transactional
    public R outLocBoxExcelImport1(MultipartFile file) throws IOException {
        OutLocBoxExcelListener listener = new OutLocBoxExcelListener(getUserId());
        EasyExcel.read(file.getInputStream(), OutLocBoxExcel.class, listener).sheet().doRead();
        OutpandianBoxExeclListener listener = new OutpandianBoxExeclListener(getUserId());
        EasyExcel.read(file.getInputStream(), pandianExcel.class, listener).sheet().doRead();
        return R.ok("成功出库"+listener.getTotal()+"条商品数据");
    }


 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -217,6 +217,9 @@
        if (Cools.isEmpty(batch)){
            return R.error("参数为空");
        }
        String[] batch1 = batch.split("箱号：");
        String[] batch2 = batch1[1].split("规格：");
        batch = batch2[0];
//        List<Order> orders = orderService.selectorderNoL(batch);
        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
        if (Cools.isEmpty(wrkDetl)){

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

@@ -9,12 +9,10 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.TagService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.service.*;
import com.zy.common.entity.OutLocBoxExcel;
import com.zy.common.model.LocDto;
import lombok.extern.slf4j.Slf4j;
@@ -85,6 +83,7 @@
    public void doAfterAllAnalysed(AnalysisContext ctx) {
        if (!Cools.isEmpty(OutLocBoxCs) && OutLocBoxCs.size() != 0) {
            LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
            LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
            WorkService workService = SpringUtils.getBean(WorkService.class);
            List<LocDto> locDtos = new ArrayList<>();
            List<String[]> outLocBoxCList = new ArrayList<>();
@@ -96,6 +95,13 @@
                    if (Cools.isEmpty(locDetlSou)){
                        throw new CoolException("箱号："+outLocBoxC[0]+" 未查询到数据！！！");
                    }
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlSou.getLocNo()));
                    if (Cools.isEmpty(locMast)){
                        throw new CoolException("箱号："+outLocBoxC[0]+" 所在库位不满足出库条件！！！未查询到此箱号所在库位");
                    }
                    if (!locMast.getLocSts().equals("F")){
                        throw new CoolException("箱号："+outLocBoxC[0]+" 所在库位不满足出库条件！！！库位状态不为F！！！库位状态："+locMast.getLocSts$());
                    }
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                            .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
                    for (LocDetl locDetl:locDetls){

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

@@ -8,8 +8,10 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WorkService;
import com.zy.common.entity.pandianExcel;
import com.zy.common.model.LocDto;
@@ -74,6 +76,7 @@
        ArrayList<LocDetl> locDetls1 = new ArrayList<>();
        if (!Cools.isEmpty(OutLocBoxCs) && OutLocBoxCs.size() != 0) {
            LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
            LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
            WorkService workService = SpringUtils.getBean(WorkService.class);
            List<LocDto> locDtos = new ArrayList<>();
            List<String[]> outLocBoxCList = new ArrayList<>();
@@ -85,13 +88,19 @@
                    if (Cools.isEmpty(locDetlSou)){
                        throw new CoolException("箱号："+outLocBoxC[0]+" 未查询到数据！！！");
                    }
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlSou.getLocNo()));
                    if (Cools.isEmpty(locMast)){
                        throw new CoolException("箱号："+outLocBoxC[0]+" 所在库位不满足出库条件！！！未查询到此箱号所在库位");
                    }
                    if (!locMast.getLocSts().equals("F")){
                        throw new CoolException("箱号："+outLocBoxC[0]+" 所在库位不满足出库条件！！！库位状态不为F！！！库位状态："+locMast.getLocSts$());
                    }
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                            .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
                    for (LocDetl locDetl:locDetls){
                        total++;
                        String[] locDetlNow=new String[2];
                        locDetlNow[0] = locDetl.getBatch();
                        locDetlNow[1] = outLocBoxC[1];
                        outLocBoxCList.add(locDetlNow);
                        outLocBoxCNew.add(outLocBoxC[0]);
                    }
@@ -135,12 +144,12 @@

                locDetls1.add(locDetl);
            }
            //if (total>0){
            //    workService.startupFullTakeStoreOrder(param,9999L);
            //}
            if (total>0){
                workService.locCheckOut(param,9999L);
            }

        }
        //return locDetls1;
        log.info("盘点出库{}条箱号！", total);
    }

    public int getTotal() {