Merge remote-tracking branch 'origin/devlop-phyz-spring3.5' into devlop-phy...

zhou zhou

20 小时以前 830bb157b5e46a6c041d5f0c0a883a22e37cb0f7

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java

@@ -123,7 +123,7 @@
        if ("200".equals(resultMsg)){
            return  CommonResponse.ok(resultMsg);
        }
        return CommonResponse.ok();
        return CommonResponse.error(resultMsg);
    }

    @ApiOperation("入/出库任务通知单")
@@ -145,6 +145,9 @@
            String i = erpReportService.addOrderToServer(order);
            if (i.equals("200")){
                errorMsg.append(order.getOrderNo()+"下发成功;");
                if (orderList.size()==1){
                    return CommonResponse.ok(errorMsg.toString());
                }
            } else {
                errorMsg.append(order.getOrderNo()+"下发失败,原因："+i+";");
                if (orderList.size()==1){