自动化立体仓库 - WMS系统
ZY
2024-09-26 fa010ce6b4ae79abd73dc29031649f0597b87939
接口路径修改
3个文件已修改
66 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/MobileController.java 60 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -425,37 +425,37 @@
        return mobileService.manDetlOriginOut(json,getUser());
    }
    @RequestMapping("/plaDetl/packin/v1")
    //@ManagerAuth(memo="pla入库")
    @Transactional
    public R plaPackIn(@RequestBody JSONObject json) throws ParseException {
        String locNo = json.get("locNo").toString();
        JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
        //判断此次入库是否达到库存上限
        if(!mobileService.checkMaximum(locNo,jsonArray.size())){
            return R.error("当前入库包数已超过库存上限");
        }
        for (Object o : jsonArray){
            JSONObject jsonObject = (JSONObject)o;
            String brand = jsonObject.get("brand").toString();
            String batch = jsonObject.get("batch").toString();
            Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
            if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
                return R.error("有参数为空,无法入库");
            }
            //测试
            if(true){
                User user = new User();
                user.setUsername("test");
                mobileService.plaPakin(brand,locNo,batch,packageNo,user);
            }
        }
        //入库成功后上报ERP
        //openService.pakinReportErp(json);
        return R.ok("入库成功");
    }
//    @RequestMapping("/plaDetl/packin/v1")
//    //@ManagerAuth(memo="pla入库")
//    @Transactional
//    public R plaPackIn(@RequestBody JSONObject json) throws ParseException {
//        String locNo = json.get("locNo").toString();
//        JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
//        //判断此次入库是否达到库存上限
//        if(!mobileService.checkMaximum(locNo,jsonArray.size())){
//            return R.error("当前入库包数已超过库存上限");
//        }
//        for (Object o : jsonArray){
//            JSONObject jsonObject = (JSONObject)o;
//            String brand = jsonObject.get("brand").toString();
//            String batch = jsonObject.get("batch").toString();
//            Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
//            if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
//                return R.error("有参数为空,无法入库");
//            }
//            //测试
//            if(true){
//                User user = new User();
//                user.setUsername("test");
//                mobileService.plaPakin(brand,locNo,batch,packageNo,user);
//            }
//        }
//        //入库成功后上报ERP
//        //openService.pakinReportErp(json);
//        return R.ok("入库成功");
//    }
    @RequestMapping("/plaDetl/packin/v11")
    @RequestMapping("/plaDetl/packin/v1")
    @ManagerAuth(memo="pla入库")
    @Transactional
    public R plaPackInTestErp(@RequestBody JSONObject json) throws ParseException {
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -696,7 +696,7 @@
                    .setJson(JSONObject.toJSONString(requestParam))
                    .build()
                    .doPost();
            log.info("请求返回报文:{}", response);
            log.info("入库单上报请求返回报文:{}", response);
            response = response.replace("\\", "");
            response = response.substring(1, response.length() - 1);
@@ -704,7 +704,7 @@
            JSONArray jsonArray = (JSONArray) jsonObject.get("");
            JSONObject jsonResult = (JSONObject) jsonArray.get(0);
            if (Cools.isEmpty(jsonResult.get("ErrorCode"))) {
                throw new CoolException(jsonResult.get("errorMsg").toString());
                throw new CoolException(jsonResult.get("ErrorMsg").toString());
            }
            int code = Integer.parseInt(jsonResult.get("ErrorCode").toString());
src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
@@ -91,7 +91,7 @@
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            log.info("上报ERP出库单据请求返回报文:{}", response);
            if (Cools.isEmpty(jsonObject.get("ErrorCode"))) {
                throw new CoolException(jsonObject.get("ErrorMsg").toString());
            }