Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-10-10 73a5abf448a0367d8472f9e7545a076d21d804b1

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java

@@ -52,7 +52,7 @@
    private WmsService wmsService;

    @PreventRepeat
    @ApiOperation("【CMS】推送入库单通知任务")
    @ApiOperation("【WMS】推送入库单通知任务")
    @PostMapping("/push/inboundNotice")
    public WmsBaseResponse inboundNotice(@RequestBody WmsBaseRequest<WmsInboundNoticeRequest> param) {

@@ -61,22 +61,21 @@
        try {
             result = wmsService.inboundNotice(param);
        }catch (BusinessException e){
            log.error("【CMS】推送入库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送入库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送入库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送入库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/inboundNotice", "推送入库单通知任务",JSONObject.toJSONString(param),
                    success, JSONObject.toJSONString(result),Constants.ONE);
        }

        return result;
    }

    @PreventRepeat
    @ApiOperation("【CMS】推送出库单通知任务")
    @ApiOperation("【WMS】推送出库单通知任务")
    @PostMapping("/push/outboundNotice")
    public WmsBaseResponse outboundNotice(@RequestBody WmsBaseRequest<WmsOutboundNoticeRequest> param) {
        int success = Constants.ZERO;
@@ -84,10 +83,10 @@
        try {
              result = wmsService.outboundNotice(param);
        }catch (BusinessException e){
            log.error("【CMS】推送出库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送出库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送出库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送出库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
@@ -98,7 +97,7 @@
        return result;
    }
    @PreventRepeat
    @ApiOperation("【CMS】推送取消入库单通知任务")
    @ApiOperation("【WMS】推送取消入库单通知任务")
    @PostMapping("/push/cancelInbound")
    public WmsBaseResponse cancelInbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
@@ -106,10 +105,10 @@
        try {
            result = wmsService.cancelInbound(param);
        }catch (BusinessException e){
            log.error("【CMS】推送取消入库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送取消入库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送取消入库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送取消入库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
@@ -119,7 +118,7 @@
        return result;
    }
    @PreventRepeat
    @ApiOperation("【CMS】推送取消出库单通知任务")
    @ApiOperation("【WMS】推送取消出库单通知任务")
    @PostMapping("/push/cancelOutbound")
    public WmsBaseResponse cancelOutbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
@@ -127,10 +126,10 @@
        try {
            result = wmsService.cancelOutbound(param);
        }catch (BusinessException e){
            log.error("【CMS】推送取消出库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送取消出库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送取消出库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送取消出库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
@@ -140,7 +139,7 @@
        return result;
    }
    @PreventRepeat
    @ApiOperation("【CMS】推送出入库作业完成通知任务")
    @ApiOperation("【WMS】推送出入库作业完成通知任务")
    @PostMapping("/push/doneTask")
    public WmsBaseResponse doneTask(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
@@ -148,10 +147,10 @@
        try {
            result = wmsService.doneTask(param);
        }catch (BusinessException e){
            log.error("【CMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            log.error("【WMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            log.error("【WMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {