Merge remote-tracking branch 'origin/main'

sql/20231013cyl.sql

@@ -1,7 +1,7 @@
 INSERT INTO `lyr-one`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (NULL, '合同类型', 'contract_type', 0, NULL, '', '2023-09-27 14:47:57', '', '2023-09-27 14:48:10', b'0', '1970-01-01 00:00:00');
 INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '劳动合同', '1', 'contract_type', 0, 'default', '', NULL, '', '2023-09-27 14:57:34', '', '2023-09-27 14:57:34', b'0');
 INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '租赁合同', '2', 'contract_type', 0, 'default', '', NULL, '', '2023-09-27 14:57:42', '', '2023-09-27 14:57:42', b'0');
-INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '买买合同', '3', 'contract_type', 0, 'default', '', NULL, '', '2023-09-27 14:57:55', '', '2023-09-27 14:57:55', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '买卖合同', '3', 'contract_type', 0, 'default', '', NULL, '', '2023-09-27 14:57:55', '', '2023-09-27 14:57:55', b'0');
 INSERT INTO `lyr-one`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (NULL, '合同状态', 'contract_status', 0, NULL, '', '2023-09-27 14:48:17', '', '2023-09-27 14:48:17', b'0', '1970-01-01 00:00:00');
 INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '有效', '1', 'contract_status', 0, 'default', '', NULL, '', '2023-09-27 15:03:53', '', '2023-09-27 15:03:53', b'0');
 INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '无效', '2', 'contract_status', 0, 'default', '', NULL, '', '2023-09-27 15:04:01', '', '2023-09-27 15:04:21', b'0');

sql/231101CYL.sql

@@ -0,0 +1,32 @@
+
+--其他档案业务类型字典
+INSERT INTO `lyr-one`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (NULL, '其他档案业务类型', 'other_business_type', 0, NULL, '', '2023-11-01 16:53:22', '', '2023-11-01 16:53:22', b'0', '1970-01-01 00:00:00');
+
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '政府', '0', 'other_business_type', 0, 'success', '', NULL, '', '2023-11-01 16:54:01', '', '2023-11-01 16:54:01', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '集体', '1', 'other_business_type', 0, 'success', '', NULL, '', '2023-11-01 16:54:10', '', '2023-11-01 16:54:10', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '私人', '2', 'other_business_type', 0, 'success', '', NULL, '', '2023-11-01 16:54:17', '', '2023-11-01 16:54:17', b'0');
+
+
+
+
+--咨询类型/资产类型字典
+INSERT INTO `lyr-one`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (NULL, '咨询类型', 'consultation_type', 0, NULL, '', '2023-10-31 16:56:17', '', '2023-10-31 16:56:17', b'0', '1970-01-01 00:00:00');
+INSERT INTO `lyr-one`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (NULL, '资产类型', 'asset_type', 0, NULL, '', '2023-10-31 17:26:01', '', '2023-10-31 17:26:01', b'0', '1970-01-01 00:00:00');
+
+
+
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '一般性咨询', '0', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:56:53', '', '2023-10-31 16:56:53', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '专业性咨询', '1', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:57:07', '', '2023-10-31 16:57:07', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '事实性咨询', '2', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:57:21', '', '2023-10-31 16:57:21', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '知识性咨询', '3', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:57:35', '', '2023-10-31 16:57:35', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '专题研究性咨询', '4', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:58:00', '', '2023-10-31 16:58:00', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '情报性咨询', '5', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:58:14', '', '2023-10-31 16:58:14', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '现金', '0', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:26:14', '', '2023-10-31 17:26:14', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '固定收益类资产', '1', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:26:26', '', '2023-10-31 17:26:26', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '房地产资产', '2', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:26:37', '', '2023-10-31 17:26:37', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1359, 3, '现金流资产', '3', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:26:52', '', '2023-10-31 17:26:52', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1360, 4, '非生产性资产', '4', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:27:05', '', '2023-10-31 17:27:05', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1361, 5, '权益类资产', '5', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:27:16', '', '2023-10-31 17:27:16', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1362, 6, '债券', '6', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:27:23', '', '2023-10-31 17:27:23', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1363, 7, '经营性国有资产', '7', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:27:56', '', '2023-10-31 17:27:56', b'0');
+INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1364, 8, '黄金', '8', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:28:04', '', '2023-10-31 17:28:04', b'0');

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/InvoicesController.java

@@ -75,6 +75,10 @@ public class InvoicesController {
     @Operation(summary = "更新发票")
     @PreAuthorize("@ss.hasPermission('accounting:invoices:update')")
     public CommonResult<Boolean> updateInvoices(@Valid @RequestBody InvoicesUpdateReqVO updateReqVO) {
+        InvoicesDO invoices = invoicesService.getInvoices(updateReqVO.getId());
+        if (invoices.getVoucherId() !=null){
+            return error("该发票已被关联");
+        }
         invoicesService.updateInvoices(updateReqVO);
         return success(true);
     }

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/voucher/VoucherController.java

@@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.accounting.dal.dataobject.attachment.AttachmentDO
 import cn.iocoder.yudao.module.accounting.dal.dataobject.bankslip.BankSlipDO;
 import cn.iocoder.yudao.module.accounting.dal.dataobject.flow.FlowDO;
 import cn.iocoder.yudao.module.accounting.dal.dataobject.invoices.InvoicesDO;
+import cn.iocoder.yudao.module.accounting.enums.AccountingStatusEnum;
 import cn.iocoder.yudao.module.accounting.service.attachment.AttachmentService;
 import cn.iocoder.yudao.module.accounting.service.bankslip.BankSlipService;
 import cn.iocoder.yudao.module.accounting.service.flow.FlowService;
@@ -97,6 +98,10 @@ public class VoucherController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('accounting:voucher:delete')")
     public CommonResult<Boolean> deleteVoucher(@RequestParam("id") Long id) {
+        VoucherDO voucher = voucherService.getVoucher(id);
+        if (voucher.getFileStatus().equals(AccountingStatusEnum.LOGFILE.getValue())){
+            return error("该凭证已归档，请勿删除！");
+        }
         voucherService.deleteVoucher(id);
         return success(true);
     }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/coderule/CodeRuleServiceImpl.java

@@ -116,6 +116,9 @@ public class CodeRuleServiceImpl implements CodeRuleService {
             int year = calendar.get(Calendar.YEAR);
             //保管期限
             String timeLimit = authenticateDO.getTimeLimit();
+            if (timeLimit.equals("永久保存")){
+                timeLimit="30";
+            }
             int year2 = year + Integer.valueOf(timeLimit);
             //只有延长保存的
             synchronized (this) {

yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/controller/admin/depotcabinet/vo/DepotCabinetCreateReqVO.java

@@ -14,7 +14,7 @@ public class DepotCabinetCreateReqVO extends DepotCabinetBaseVO {
     @NotNull(message = "所属库房不能为空")
     private Long depotId;
 
-    @NotNull(message = "档案柜名称不能为空")
+    @NotNull(message = "档案柜类型不能为空")
     private String name;
 
 }