Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2 天以前 846b74917841f922795425d0f063dc35fbb9e39c

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java

@@ -96,6 +96,7 @@
            if (null == diffItem){
                return R.error("数据错误，未找到差异单明细");
            }
            checkDiffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
            if(!checkDiffItemService.updateById(checkDiffItem)){
                throw new CoolException("更新差异单明细失败");
            }