#

LSH

2023-05-18 7be83adcdc6ee45fce42d14d7da2be33b1bcc216

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

@@ -573,8 +573,8 @@
            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.getSettingTimes())){
//            throw new CoolException("缺少参数：settingTimes");
        }else if (Cools.isEmpty(param.getRequestTime())){
            throw new CoolException("缺少参数：requestTime");
        }
@@ -612,6 +612,7 @@
            if (!matService.insert(matNew)){
                throw new CoolException(param.getPackName() + "商品档案自动生成失败");
            }
            mat=matNew;
//            throw new CoolException(param.getPackName() + "商品档案不存在");
        }
        WaitPakin waitPakin = new WaitPakin();
@@ -627,7 +628,7 @@
        waitPakin.setAppeTime(new Date());
        waitPakin.setModiUser(null);
        waitPakin.setModiTime(new Date());
        waitPakin.setDeadWarn(param.getSettingTimes());
        waitPakin.setDeadWarn(mat.getDeadWarn());
        if (!waitPakinService.insert(waitPakin)) {
            throw new CoolException("保存入库通知档失败");
        }
@@ -798,12 +799,12 @@
                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);
//                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("更改产品状态失败");
@@ -839,12 +840,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("更改产品状态失败");