# 显示器

whycq

2023-11-11 f20987a557aad10cb54eb064efc27780c70aa2c9

# 显示器

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -2384,45 +2384,64 @@
                ledCommand.setLocNo(wrkMast.getLocNo());
                ledCommand.setStaNo(wrkMast.getStaNo());
                if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
                    List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
                    for (WrkDetl wrkDetl : wrkDetls) {
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
                        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()));
                        locDetls.forEach(locDetl1 -> {
                            //工作档中存在该物料则跳过
                    //for (WrkDetl wrkDetl : wrkDetls) {
                    //    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
                    //
                    //    locDetls.forEach(locDetl1 -> {
                    //        //工作档中存在该物料则跳过
                    //        String suppCode = "";
                    //
                    //        if (wrkDetl.getMatnr().equals(locDetl1.getMatnr())) {
                    //            Double anfme = 0D;
                    //            if (locDetl != null) {
                    //                anfme = locDetl.getAnfme();
                    //            }
                    //            if (wrkDetl.getSuppCode() != null) {
                    //                suppCode = wrkDetl.getSuppCode();
                    //            }
                    //            ledCommand.getMatDtos()
                    //                    .add(new MatDto(wrkDetl.getMatnr()
                    //                            , wrkDetl.getMaktx()
                    //                            , wrkDetl.getAnfme()
                    //                            , (wrkDetl.getAnfme()-anfme)
                    //                            , wrkDetl.getSpecs()
                    //                            , suppCode));
                    //        } else {
                    //            if (locDetl1.getSuppCode() != null) {
                    //                suppCode = locDetl1.getSuppCode();
                    //            }
                    //            ledCommand.getMatDtos()
                    //                    .add(new MatDto(locDetl1.getMatnr()
                    //                            , locDetl1.getMaktx()
                    //                            , 0D
                    //                            , locDetl1.getAnfme()
                    //                            , locDetl1.getSpecs()
                    //                            , suppCode));
                    //        }
                    //    });
                    //    //LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
                    //}
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
                    locDetls.forEach(locDetl -> {
                        Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no",wrkMast.getWrkNo());
                        Utils.wapperSetCondition(wrapper,"batch",locDetl.getBatch());
                        Utils.wapperSetCondition(wrapper,"three_code",locDetl.getThreeCode());
                        Utils.wapperSetCondition(wrapper,"dead_time",locDetl.getDeadTime());
                        WrkDetl detl = wrkDetlService.selectOne(wrapper);
                        if (Cools.isEmpty(detl)) {
                            String suppCode = "";

                            if (wrkDetl.getMatnr().equals(locDetl1.getMatnr())) {
                                Double anfme = 0D;
                                if (locDetl != null) {
                                    anfme = locDetl.getAnfme();
                                }
                                if (wrkDetl.getSuppCode() != null) {
                                    suppCode = wrkDetl.getSuppCode();
                                }
                                ledCommand.getMatDtos()
                                        .add(new MatDto(wrkDetl.getMatnr()
                                                , wrkDetl.getMaktx()
                                                , wrkDetl.getAnfme()
                                                , (wrkDetl.getAnfme()-anfme)
                                                , wrkDetl.getSpecs()
                                                , suppCode));
                            } else {
                                if (locDetl1.getSuppCode() != null) {
                                    suppCode = locDetl1.getSuppCode();
                                }
                                ledCommand.getMatDtos()
                                        .add(new MatDto(locDetl1.getMatnr()
                                                , locDetl1.getMaktx()
                                                , 0D
                                                , locDetl1.getAnfme()
                                                , locDetl1.getSpecs()
                                                , suppCode));
                            if (locDetl.getSuppCode() != null) {
                                suppCode = locDetl.getSuppCode();
                            }
                        });
                        //LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));

                    }
                            ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
                        } else {
                            String suppCode = "";
                            if (detl.getSuppCode() != null) {
                                suppCode = detl.getSuppCode();
                            }
                            ledCommand.getMatDtos().add(new MatDto(detl.getMatnr(), detl.getMaktx(), detl.getAnfme(), (locDetl.getAnfme() - detl.getAnfme()), detl.getSpecs(), suppCode));
                        }
                    });
                }
                commands.add(ledCommand);
            }

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -593,4 +594,12 @@
        return null;
    }

    public static void wapperSetCondition(Wrapper wrapper, String column, String condition){
        if(Cools.isEmpty(condition) || "null".equals(condition)){
            wrapper.andNew().eq(column,"").or().isNull(column);
        }else {
            wrapper.eq(column,condition);
        }
    }

}