完善

野心家

2025-06-21 288e45a990a5abf4ab50f820ed4e870e8314468e

 src/main/java/com/zy/common/web/WcsController.java

@@ -52,10 +52,10 @@
    @Autowired
    private  MatService matService;

    @Value("mes.url")
    @Value("${mes.url}")
    private String mesUrl;

    @Value("mes.inPath")
    @Value("${mes.inPath}")
    private String inpath;

    @PostMapping("/pakin/loc/v1")
@@ -68,85 +68,41 @@
        if (Cools.isEmpty(param.getSourceStaNo())) {
            return R.error("源站编号不能为空");
        }
        if (Cools.isEmpty(param.getBarcode())) {
            return R.error("托盘码不能为空");
        }
        boolean logs=true;
        TestMast testMast11=new TestMast();
        //如果pack码为空，查测试表
        if (Cools.isEmpty(param.getPackNo())) {
            testMast11= testMastService.selectOne(new EntityWrapper<TestMast>()
                    .eq("user_id",param.getBarcode())//查托盘码
                    .eq("status",4));   //完成测试
            logs=false;
        }else{
            LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>()
                    .eq("matnr",param.getPackNo())
                    .or()
                    .eq("zpallet",param.getBarcode()));
            if(!Cools.isEmpty(locDetl)){
                return R.error("PACK码在库！！！！");
            }

        }
        Date now = new Date();
        if (true){
            try{
                Mat mat=new Mat();
                if(logs){
                    mat = matService.selectByMatnr(param.getPackNo());
                }else {
                    mat = matService.selectByMatnr(testMast11.getBarcode());
                }

                if (Cools.isEmpty(mat)){
                    return R.error("商品信息档案未查询到pack信息"+param.getPackNo());
                }
                WaitPakin waitPakin = new WaitPakin();
                int i = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
                if(i==0){
                    waitPakin.setMatnr(mat.getMatnr());// Pack码
                    waitPakin.setMaktx(mat.getMaktx());
                    waitPakin.setZpallet(param.getBarcode());   //托盘码
                    waitPakin.setIoStatus("N");     // 入出状态
                    waitPakin.setAnfme(1.0);  // 数量
                    waitPakin.setStatus("Y");    // 状态
                    waitPakin.setManuDate(mat.getManuDate());
                    waitPakin.setAppeUser(null);
                    waitPakin.setAppeTime(now);
                    waitPakin.setModiUser(null);
                    waitPakin.setModiTime(now);
                    waitPakin.setDeadWarn(mat.getDeadWarn());
                    if (!waitPakinService.insert(waitPakin)) {
                        throw new CoolException("保存入库通知档失败");
                    }
                }
            }catch (Exception e){

            }
        }
        List<WaitPakin> waitPakins = null;
        if (param.getIoType() == 1) {
            if (Cools.isEmpty(param.getBarcode())) {
                return R.error("条码不能为空");
            }
            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
            if (Cools.isEmpty(waitPakins) || waitPakins.size() !=1) {
            List<WaitPakin> beBatch = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("be_batch", 1));
            if(beBatch.size() > 1){
                return  R.error("组托档中有多条搬运任务");
            }else if(Cools.isEmpty(beBatch)){
                return  R.error("组托档中没有搬运任务");
            }
            if (Cools.isEmpty(waitPakins)) {
                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
                if (wrkMast != null || waitPakins.size() !=1) {
                if (wrkMast != null) {
                    return R.parse("600-重复组托");
                }
                return R.parse(CodeRes.NO_COMB_700);
            }
            int countWait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode())
            .eq("io_status", "Y"));
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
            if (countLoc > 0 || countWrk > 0 || countWait > 0) {
                if (!Cools.isEmpty(waitPakins.get(0).getDeadWarn()) && waitPakins.get(0).getDeadWarn()!=0){
                    return R.error(CodeRes.EXIST_500);
                for (WaitPakin waitPakin : beBatch) {
                    waitPakin.setZpallet(param.getBarcode());
                    waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("be_batch",1));
                }
            }else {
                int countWait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode())
                        .eq("io_status", "Y"));
                int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
                int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
                if (countLoc > 0 || countWrk > 0 || countWait > 0) {
                    if (!Cools.isEmpty(waitPakins.get(0).getDeadWarn()) && waitPakins.get(0).getDeadWarn()!=0){
                        return R.error(CodeRes.EXIST_500);
                    }
                }
            }

        }
        if (Cools.isEmpty(param.getLocType1())){
            param.setLocType1((short)1);
@@ -154,8 +110,7 @@

        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
//        sourceStaNo.setLocType1(param.getLocType1());
        sourceStaNo.setLocType1((short)1);
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        StartupDto dto = null;
@@ -228,7 +183,8 @@
            }

                TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                        .eq("barcode", wrkDetl.getMatnr()));//pack码
                        .eq("barcode", wrkDetl.getMatnr())
                        .eq("user_id",wrkDetl.getZpallet()));//pack码
                if (Cools.isEmpty(testMast)){
                    //生成测试档
                    testMast=new TestMast();
@@ -246,14 +202,6 @@
                    testMast.setAppeTime(now);
                    if (!testMastService.insert(testMast)){
                        throw new CoolException(wrkDetl.getMatnr()+"生成测试档失败");
                    }
                }else if(wrkMast.getStaNo()==209){
                    testMast.setBarcode(wrkDetl.getMatnr());
                    testMast.setLocNo(locMast.getLocNo());
                    testMast.setUserId(wrkMast.getBarcode());//托盘码
                    testMast.setAppeTime(now);
                    if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", wrkDetl.getMatnr()))){
                        throw new CoolException(wrkDetl.getMatnr()+"更新测试档失败");
                    }
                }else {
                    testMast.setBarcode(wrkDetl.getMatnr());
@@ -291,17 +239,6 @@
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)){
                throw new CoolException("改变库位状态失败");
            }else{
//                if (locMast.getRow1()<3){
//                    //1.扫码上报
//                    CombParam combParam = new CombParam();
//                    combParam.setPackNo(wrkMast.getBarcode());
//                    combParam.setLocNo(wrkMast.getLocNo());
//                    combParam.setPackSts(0);
//                    combParam.setStepSts(1);
//                    combParam.setRequestTime(DateUtils.convert(now));
//                    new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
//                }
            }
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");