Merge branch 'ty_urgent' into api

Helius

2020-12-23 844e37605b65a2a3d95b466d663d91ac8584350c

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysInstoreInfoServiceImpl.java

@@ -69,9 +69,10 @@
        Long id = sysInstoreInfo.getId();
        SysInstoreInfo getInstoreInfo = sysInstoreInfoDao.selectById(id);
        // 已经审核过的单据不能在修改
        if (!getInstoreInfo.getCheckStatus().equals(Dictionary.CHECK_STATUS_DSH)) {
        if (!getInstoreInfo.getCheckStatus().equals(Dictionary.CHECK_STATUS_DSH) && !getInstoreInfo.getCheckStatus().equals(Dictionary.CHECK_STATUS_SHWTG)) {
            throw new GlobleException("已审核，不能再修改");
        }
        sysInstoreInfo.setCheckStatus(Dictionary.CHECK_STATUS_DSH);
        // 设置总金额
        sysInstoreInfo.setSumall(savevDetatil(sysInstoreInfo));
        return sysInstoreInfoDao.update(sysInstoreInfo);