自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
野心家
2024-07-07 3c8343535bec2a53855956e25598e2271fc84c0d 
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java


@@ -20,6 +20,8 @@


import com.zy.common.model.enums.WorkNoType;


import com.zy.common.service.CommonService;


import com.zy.common.utils.NodeUtils;


import com.zy.system.entity.Config;


import com.zy.system.service.ConfigService;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


@@ -64,6 +66,8 @@


    private CommonService commonService;


    @Autowired


    private WrkMastService wrkMastService;


    @Autowired


    private ConfigService configService;




    @Value("${mes.inPath}")


    private String inpath;


@@ -573,64 +577,74 @@


            throw new CoolException("缺少参数：packNo");


        }else if (Cools.isEmpty(param.getPackName())){


            throw new CoolException("缺少参数：packName");


        }else if (Cools.isEmpty(param.getSettingTimes())){


            throw new CoolException("缺少参数：settingTimes");


        }else if (Cools.isEmpty(param.getRequestTime())){


            throw new CoolException("缺少参数：requestTime");


            throw new CoolException("缺少参数：requestTime");//此参数填入生产日期一栏  不用可关闭


        }


        if (Cools.isEmpty(param.getPackNo())) {


            throw new CoolException(BaseRes.PARAM);


        }


        // 判断是否有相同Pack码的数据


        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().


                eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) {


            throw new CoolException(param.getPackNo() + "数据正在进行入库");


        }


//        // 判断是否有相同Pack码的数据


//        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().


//                eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) {


//            throw new CoolException(param.getPackNo() + "数据正在进行入库");


//        }




        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));


        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));


        int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo()));


        if (countLoc > 0 || countWrk > 0) {


            throw new CoolException("工作档/库存条码数据已存在===>>" + param.getPackNo());


        }else if (countPakin>0){


            throw new CoolException("重复申请" + param.getPackNo());


        }


//        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));


//        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));


//        int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo()));


//        if (countLoc > 0 || countWrk > 0) {


//            throw new CoolException("工作档/库存条码数据已存在===>>" + param.getPackNo());


//        }else if (countPakin>0){


//            throw new CoolException("重复申请" + param.getPackNo());


//        }




//         生成入库通知档


        Mat mat = matService.selectByMatnr(param.getPackName());


        Mat mat = matService.selectByMatnr(param.getPackNo());


        Date now = new Date();


        if (Cools.isEmpty(mat)) {


            Tag tag = tagService.selectByName("全部", 1);


            Mat matNew = new Mat();


            matNew.setTagId(tag.getId());


            matNew.setMatnr(param.getPackName());


            matNew.setMatnr(param.getPackNo());


            matNew.setMaktx(param.getPackName());


            matNew.setDeadWarn(480);//8小时  480分钟


            matNew.setManuDate(param.getRequestTime());


            matNew.setDeadWarn(1440);//6小时  360分钟  24小时  1440分钟


            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "JingZhiTime"));


            if (!Cools.isEmpty(config)){


                try{


                    int time = Integer.parseInt(config.getValue());


                    matNew.setDeadWarn(time);//6小时  360分钟  24小时  1440分钟


                }catch (Exception e){




                }


            }


            matNew.setCreateBy(9999L);//9999表示erp下发


            matNew.setCreateTime(new Date());


            matNew.setCreateTime(now);


            matNew.setUpdateBy(9999L);//9999表示erp下发


            matNew.setUpdateTime(new Date());


            matNew.setUpdateTime(now);


            if (!matService.insert(matNew)){


                throw new CoolException(param.getPackName() + "商品档案自动生成失败");


            }


//            mat=matNew;


//            throw new CoolException(param.getPackName() + "商品档案不存在");


        }


        WaitPakin waitPakin = new WaitPakin();


//        waitPakin.sync(mat);


        waitPakin.setMatnr(param.getPackName());


        waitPakin.setMaktx(param.getPackName());


        waitPakin.setZpallet(param.getPackNo());   // Pack码


        waitPakin.setIoStatus("N");     // 入出状态


        waitPakin.setAnfme(1.0);  // 数量


        waitPakin.setStatus("Y");    // 状态


        waitPakin.setManuDate(param.getRequestTime());


        waitPakin.setAppeUser(null);


        waitPakin.setAppeTime(new Date());


        waitPakin.setModiUser(null);


        waitPakin.setModiTime(new Date());


        waitPakin.setDeadWarn(param.getSettingTimes());


        if (!waitPakinService.insert(waitPakin)) {


            throw new CoolException("保存入库通知档失败");


        }


//        WaitPakin waitPakin = new WaitPakin();


////        waitPakin.sync(mat);


//        waitPakin.setMatnr(param.getPackName());


//        waitPakin.setMaktx(param.getPackName());


//        waitPakin.setZpallet(param.getPackNo());   // Pack码


//        waitPakin.setIoStatus("N");     // 入出状态


//        waitPakin.setAnfme(1.0);  // 数量


//        waitPakin.setStatus("Y");    // 状态


//        waitPakin.setManuDate(param.getRequestTime());


//        waitPakin.setAppeUser(null);


//        waitPakin.setAppeTime(new Date());


//        waitPakin.setModiUser(null);


//        waitPakin.setModiTime(new Date());


//        waitPakin.setDeadWarn(mat.getDeadWarn());


//        if (!waitPakinService.insert(waitPakin)) {


//            throw new CoolException("保存入库通知档失败");


//        }


    }


    @Override


    @Transactional


@@ -777,46 +791,9 @@


        return testMast;


    }






    @Override


    @Transactional


    public Boolean testFinish(Review review) {


        Boolean success=true;


        Wrapper wrapper = new EntityWrapper<TestMast>()


                .eq("loc_no", review.getLocNo())


                .eq("barcode", review.getBarcode())


                .eq("user_Id", review.getUserId());


        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));


        if (null == locMast ||locMast.getPackStatus()!=2){


            throw new CoolException("产品状态不是 2:测试中");


        }else if (!review.getBarcode().equals(locMast.getBarcode())){


            throw new CoolException("pack码不同");


        }


        TestMast testMast = testMastService.selectOne(wrapper);


        if(null != testMast){


            if (testMast.getStatus()==3){


                Date date = new Date();


                locMast.setPackStatus(3);


                locMast.setModiTime(date);


                CombParam combParam = new CombParam();


                combParam.setPackNo(locMast.getBarcode());


                combParam.setLocNo(locMast.getLocNo());


                combParam.setPackSts(3);


                combParam.setRequestTime(DateUtils.convert(new Date()));


                new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);




                if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){


                    throw new CoolException("更改产品状态失败");


                }


            }else if (Cools.isEmpty(testMast.getStatus())){


                throw new CoolException("状态异常");


            }else {


                throw new CoolException("测试状态不是 3:测试中");


            }


        } else {


            throw new CoolException("状态异常");


        }


        return success;


        return null;


    }




    @Override


@@ -839,12 +816,12 @@


                Date date = new Date();


                locMast.setPackStatus(4);


                locMast.setModiTime(date);


                CombParam combParam = new CombParam();


                combParam.setPackNo(locMast.getBarcode());


                combParam.setLocNo(locMast.getLocNo());


                combParam.setPackSts(4);


                combParam.setRequestTime(DateUtils.convert(new Date()));


                new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);


//                CombParam combParam = new CombParam();


//                combParam.setPackNo(locMast.getBarcode());


//                combParam.setLocNo(locMast.getLocNo());


//                combParam.setPackSts(4);


//                combParam.setRequestTime(DateUtils.convert(new Date()));


//                new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);




                if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){


                    throw new CoolException("更改产品状态失败");