清空数据项

xiaoyong931011

2022-03-31 970568e63de3fe8c5e43a50a8ff3f03b39d48026

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

@@ -1027,7 +1027,7 @@
        if (CollectionUtils.isNotEmpty(projServicesVo.getOutStoreItem())) {
            BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, projServicesVo.getCompanyId());
//            if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
            if (BooleanEnum.TRUE.getValue().equals(manageStockSetting.getParamValue())) {
            if (BooleanEnum.TRUE.getValue() == manageStockSetting.getIntParamValue()) {
                for (SysOutStoreItem item : projServicesVo.getOutStoreItem()) {
                    if (item.getAmount() != null && item.getAmount() > 0) {
                        return true;
@@ -1121,12 +1121,18 @@
            sysProjServicesDao.update(checkprojServices);
        }
        //保存单据日志
        operationLogService.saveOperation(projServices.getCompanyId(), projServices.getShopId(),users.getSuId(),
//        operationLogService.saveOperation(projServices.getCompanyId(), projServices.getShopId(),users.getSuId(),
//                OperationFunctionEnum.SERVICE_ORDER,
//                OperationButtonEnum.SERVICE_ORDER_END,
//                projServices.getId(),
//                projServices.getServiceNo(),
//                projServices.getVipId());
        operationLogService.saveOperation(checkprojServices.getCompanyId(), checkprojServices.getShopId(),users.getSuId(),
                OperationFunctionEnum.SERVICE_ORDER,
                OperationButtonEnum.SERVICE_ORDER_END,
                projServices.getId(),
                projServices.getServiceNo(),
                projServices.getVipId());
                checkprojServices.getId(),
                checkprojServices.getServiceNo(),
                checkprojServices.getVipId());
        return rerunlt;
    }

@@ -1170,7 +1176,7 @@
//                    flag = true;
//                    break;
//                }
                if (step.equals(setting.getCode()) && BooleanEnum.TRUE.getValue().equals(setting.getUserValue())) {
                if (step.equals(setting.getCode()) && BooleanEnum.TRUE.getValue() == Integer.parseInt(setting.getUserValue())) {
                    flag = true;
                    break;
                }