#
cp
2024-09-13 2a2d6b0c071bf744a777991efb35f5503b68598a
#
3个文件已修改
14 ■■■■■ 已修改文件
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
@@ -169,6 +169,7 @@
    @PostMapping("order/execute/auth/v1")
    public R wms1(@RequestBody Map<String, Object> map) {
        try {
            System.out.println(map.toString());
            log.info("order/execute/auth/v1:" + JSON.toJSONString(map));
            OrderParam orderParam = JSON.parseObject(JSON.toJSONString(map), OrderParam.class);
            List<DocType> list = apiService.getOrderType();
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java
@@ -48,6 +48,7 @@
                }
            } catch (Exception e){
                log.error("工作档[workNo={}]历史档处理失败", wrkMast.getWrkNo());
                log.error("工作档[workNo={}]历史档处理失败,异常:{}", wrkMast.getWrkNo(),e.getMessage());
            }
        }
    }
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
@@ -173,7 +173,7 @@
                    } catch (Exception e) {
                        e.printStackTrace();
                        //异常上报失败
//                        exceptionHandle("上报ERP异常失败[workNo={0}]失败", wrkMast.getWrkNo());
                        exceptionHandle("上报ERP异常失败[workNo={0}]失败", wrkMast.getWrkNo());
                    } finally {
                        //记录上报数据
                        OperateLog operateLog = new OperateLog();
@@ -185,6 +185,16 @@
                        operateLog.setUserId(9527L);
                        operateLog.setIp("127.0.0.1");
                        operateLogService.save(operateLog);
                        //记录上报数据
                        OperateLog operateLog1 = new OperateLog();
                        operateLog1.setAction("上报ERP," + ERP_URL + ERP_REPORT);
                        operateLog1.setRequest(param.toString());
                        operateLog1.setResponse(response);
                        operateLog1.setCreateTime(new Date());
                        operateLog1.setSystem("WMS");
                        operateLog1.setUserId(9527L);
                        operateLog1.setIp("127.0.0.1");
                        operateLogService.save(operateLog1);
                    }
                }
            }