#

LSH

2023-05-18 c33901750d296f75180f6051fbb743738ffcae7e

#

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

@@ -232,23 +232,23 @@
        return R.ok();
    }

    @PostMapping("/rpc/pakOut/auth/v1")
    @AppAuth(memo = "出库通知单接口调用")
    public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = false) CombParam param,
                                     HttpServletRequest request) {

        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        //出库开始
        openService.combPackOut(param);

        Map<String, Boolean> map = new HashMap<>();
        map.put("isComplete", true);
        return R.ok(map);
    }
//    @PostMapping("/rpc/pakOut/auth/v1")
//    @AppAuth(memo = "出库通知单接口调用")
//    public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
//                                     @RequestBody(required = false) CombParam param,
//                                     HttpServletRequest request) {
//
//        auth(appkey, param, request);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        //出库开始
//        openService.combPackOut(param);
//
//        Map<String, Boolean> map = new HashMap<>();
//        map.put("isComplete", true);
//        return R.ok(map);
//    }

//    @PostMapping("/rpv/infoReview/auth/v1")
//    @AppAuth(memo = "测试条码信息复核请求")

 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("保存入库通知档失败");
        }

 src/main/java/com/zy/asrs/task/OverYearLogScheduler.java

@@ -19,7 +19,7 @@
    @Autowired
    private OverYearLogHandler overYearLogHandler;

    @Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
        ReturnT<String> returnT = overYearLogHandler.start();
        if (!returnT.isSuccess()) {

 src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java

@@ -237,12 +237,12 @@
                if (locMast.getLocSts().equals("F")) {
                    locMast.setLocSts("R");
                    locMast.setModiTime(now);
                    locMast.setPackStatus(6); //6:静置完成
//                    locMast.setPackStatus(5); //5:开始静置

                    CombParam combParam = new CombParam();
                    combParam.setPackNo(locMast.getBarcode());
                    combParam.setLocNo(locMast.getLocNo());
                    combParam.setPackSts(6);
                    combParam.setPackSts(locMast.getPackStatus());
                    combParam.setRequestTime(DateUtils.convert(new Date()));
                    new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);


 src/main/java/com/zy/asrs/task/handler/StandingHandler.java

@@ -44,7 +44,7 @@
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private ApiLogService apiLogService;
    private MatService matService;
    @Autowired
    private CommonService commonService;
    @Autowired
@@ -64,11 +64,12 @@
                    .eq("fire_status", 0)
                    .eq("loc_sts", "F")
                    .eq("loc_type1",(short)2)
                    .eq("pack_status", 6));
                    .eq("pack_status", 5));
            Integer ioType = 101;   //入出库类型
            //静置完成出库站104
            for(LocMast locMast : locMasts){
                LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
                Mat mat = matService.selectByMatnr(locDetl.getMatnr());
                if (Cools.isEmpty(locDetl)){
                    log.error("库位:"+locMast.getLocNo()+"没有明细");
                } else if (Cools.isEmpty(locDetl.getDeadWarn())){
@@ -77,7 +78,9 @@
                    log.error("库位:"+locMast.getLocNo()+"modiTime为空");
                } else if (Cools.isEmpty(locMast.getBarcode())){
                    log.error("库位:"+locMast.getLocNo()+"Pack码为空");
                } else if (now.getTime()-locMast.getModiTime().getTime() >= locDetl.getDeadWarn()*60*1000){
                } else if (Cools.isEmpty(mat)){
                    log.error("库位:"+locMast.getLocNo()+"商品所属商品档案为空");
                } else if (now.getTime()-locMast.getModiTime().getTime() >= mat.getDeadWarn()*60*1000){
                    // 生成工作号
                    int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
                    // 生成工作档

 src/main/resources/application.yml

@@ -12,7 +12,7 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.4.13:1433;databasename=zjfnasrs
    url: jdbc:sqlserver://192.168.6.2:1433;databasename=zjfnasrs
    username: sa
    password: sa@123
  mvc: