Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java

@@ -10,7 +10,7 @@
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.WmsService;
import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -42,6 +42,7 @@
        WmsBaseResponse result =null;
        try {
            result = wmsService.inboundNotice(param);
            wmsService.computjobTotalNum(param.getJobIdList());
        }catch (BusinessException e){
            log.error("【WMS】推送入库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
@@ -64,6 +65,7 @@
        WmsBaseResponse result =null;
        try {
            result = wmsService.outboundNotice(param);
            wmsService.computjobTotalNum(param.getJobIdList());
        }catch (BusinessException e){
            log.error("【WMS】推送出库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
@@ -115,7 +117,7 @@
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "推送取消出库单通知任务",
            wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "【TMS】推送取消出库单通知任务",
                    JSONObject.toJSONString(param),  success, JSONObject.toJSONString(result),Constants.ONE);
        }
        return result;