Commit Graph

937 Commits

Author SHA1 Message Date
mashuai 20159734dd 优化 2025-02-21 03:47:55 +08:00
syruan fb47cac1c4 增加日志处理 2025-02-21 03:45:28 +08:00
syruan 1bea1f7f8b 费用减免流程修改 2025-02-21 03:11:32 +08:00
mashuai e5e01f5fd4 优化 2025-02-21 02:53:27 +08:00
bonus 0bd8c9f6eb Merge remote-tracking branch 'origin/master' 2025-02-21 02:35:23 +08:00
bonus d2e04ee62b 直转审核倒序开发 2025-02-21 02:35:01 +08:00
syruan 2ebb2d4202 Merge remote-tracking branch 'origin/master' 2025-02-21 02:26:52 +08:00
syruan 8e5f712756 费用减免工作流提交 2025-02-21 02:26:38 +08:00
zfh 4d4015b2e5 审核 2025-02-21 02:26:37 +08:00
bonus 4a90a4482b 减免接口开发 2025-02-21 01:57:45 +08:00
mashuai 978c15ed14 Merge remote-tracking branch 'origin/master' 2025-02-21 01:56:08 +08:00
mashuai 50567b761b 优化 2025-02-21 01:55:59 +08:00
bonus c56038b1b3 Merge remote-tracking branch 'origin/master' 2025-02-21 01:53:12 +08:00
zfh e808ba7e47 审核 2025-02-21 01:53:02 +08:00
bonus 3e6337b54c 直转审核接口开发 2025-02-21 01:47:38 +08:00
mashuai bba09a7220 Merge remote-tracking branch 'origin/master' 2025-02-21 01:25:59 +08:00
mashuai 9b8f76a306 优化 2025-02-21 01:25:53 +08:00
zfh 287a019e4d 审核 2025-02-21 01:19:43 +08:00
hayu 232c8d8f3c Merge remote-tracking branch 'origin/master' 2025-02-20 23:41:05 +08:00
hayu 982b0eb61c 问题修改 2025-02-20 23:40:48 +08:00
syruan 73b3c492ca 审批流通用方法优化 2025-02-20 23:40:31 +08:00
mashuai 746b572d8e 优化 2025-02-20 23:33:31 +08:00
mashuai 213d250d34 报废 2025-02-20 22:56:17 +08:00
zfh a15db088a1 审核 2025-02-20 22:42:40 +08:00
zfh 48d2534123 审核 2025-02-20 22:42:12 +08:00
zfh 09ccc004da 审核 2025-02-20 22:35:19 +08:00
hayu dcc5132ff0 问题修改 2025-02-20 22:00:39 +08:00
mashuai f277c297ea 新购绑定人 2025-02-20 21:33:52 +08:00
zfh 20a162bfc1 审核 2025-02-20 21:32:29 +08:00
zfh de852b063d 审核 2025-02-20 20:55:07 +08:00
hayu acf469307d Merge remote-tracking branch 'origin/master' 2025-02-20 20:41:10 +08:00
hayu 4715df61b1 业务 2025-02-20 20:40:53 +08:00
mashuai 9f7a65e43b Merge remote-tracking branch 'origin/master' 2025-02-20 20:40:14 +08:00
mashuai ae48eff656 盘点报废 2025-02-20 20:40:09 +08:00
zfh a1375eda07 审核 2025-02-20 20:37:52 +08:00
zfh 2db54ac3cb 审核 2025-02-20 20:37:27 +08:00
zfh 055037885d 审核 2025-02-20 20:36:57 +08:00
mashuai a060b732c0 盘点报废 2025-02-20 20:29:35 +08:00
zfh 03667beb9d 审核 2025-02-20 20:16:55 +08:00
mashuai 49a158312a 盘点报废 2025-02-20 20:14:29 +08:00
mashuai 4fe80c4a93 Merge remote-tracking branch 'origin/master' 2025-02-20 20:10:01 +08:00
mashuai 745857a223 盘点报废 2025-02-20 20:09:52 +08:00
zfh 3542b435ed Merge remote-tracking branch 'origin/master' 2025-02-20 20:05:54 +08:00
zfh 7be04ac787 审核 2025-02-20 20:05:44 +08:00
mashuai 6499410629 盘点报废 2025-02-20 19:20:55 +08:00
zfh 0b9cce98dc 审核 2025-02-20 19:03:02 +08:00
zfh cfb08c8934 审核 2025-02-20 17:28:24 +08:00
zfh 014a4b3325 审核 2025-02-20 17:26:55 +08:00
mashuai 7b7b80f461 配件 2025-02-20 10:20:32 +08:00
bonus fef30e9d8b 减免接口开发 2025-02-20 09:58:52 +08:00
bonus f32b9dcfe9 Merge remote-tracking branch 'origin/master' 2025-02-20 09:58:03 +08:00
hayu f4ca04f11b 后台业务办理记录查询,app业务办理记录查询 2025-02-19 20:29:20 +08:00
mashuai 85d9e0bacd 配件 2025-02-19 19:01:52 +08:00
mashuai 783274697f Merge remote-tracking branch 'origin/master' 2025-02-19 17:31:28 +08:00
mashuai 983ec5db92 配件 2025-02-19 17:31:20 +08:00
hayu 584f2c40c7 直转申请,直转记录查询 2025-02-18 20:04:21 +08:00
hayu dc5343ce48 直转申请,直转记录查询 2025-02-18 18:58:20 +08:00
syruan f0ed1244d0 物资类型规格排序 2025-02-18 17:34:21 +08:00
mashuai a72cebcb00 Merge remote-tracking branch 'origin/master' 2025-02-18 09:21:08 +08:00
mashuai 445cd5b722 盘点报废 2025-02-18 09:20:55 +08:00
hayu 36ceb1b340 领用申请,领用记录查询 2025-02-17 17:43:58 +08:00
bonus 03ee9b7926 减免接口-重复数据过滤1.0版修改 2025-02-17 14:49:44 +08:00
bonus cbc6e0fb39 减免实体类型修改 2025-02-17 09:06:36 +08:00
bonus 32c403c8b5 减免接口开发 2025-02-17 09:01:30 +08:00
hayu 0816be447e 标准配置,领用申请 2025-02-15 17:02:41 +08:00
syruan eacf57e3ef i皖送费用推送定时任务 2025-02-15 16:38:24 +08:00
mashuai 03f6d6fa87 Merge remote-tracking branch 'origin/master' 2025-02-15 14:13:56 +08:00
mashuai 545cff40be 综合查询报废数量修改 2025-02-15 14:13:50 +08:00
hayu 0bf50f54cd 标准配置,领用申请 2025-02-14 18:12:43 +08:00
mashuai d5ed07d4d0 优化 2025-02-14 17:54:28 +08:00
mashuai 10cc6c2cde 维修拆分 2025-02-14 17:29:40 +08:00
mashuai cf65ca7a08 台账审核 2025-02-14 17:29:10 +08:00
hongchao 52b233f067 维修 2025-02-14 16:21:51 +08:00
syruan a8af2538aa 新购验收单 2025-02-14 13:12:57 +08:00
hayu be975c3162 功能修改 2025-02-14 09:15:18 +08:00
syruan 4ece73cc63 物资类型修改1 2025-02-13 18:24:11 +08:00
syruan 40fed1be0a 物资类型修改 2025-02-13 18:19:57 +08:00
syruan 8961e76bee 物资类型历史记录查询 2025-02-13 18:14:52 +08:00
syruan 40c7f30b02 物资类型价格变更记录接口 2025-02-13 17:59:05 +08:00
mashuai 0e10b67591 功能修改优化 2025-02-11 15:29:27 +08:00
hayu 06fda2ebf7 功能修改 2025-02-11 09:21:44 +08:00
hongchao 7cb7484618 Merge remote-tracking branch 'origin/master' 2025-02-10 17:21:46 +08:00
hongchao 1bffc4c4e3 领料申请管理 2025-02-10 17:21:16 +08:00
mashuai 02fe8438a0 功能修改 2025-02-10 15:12:58 +08:00
mashuai 542d02a8d9 分包商 2025-02-07 18:17:38 +08:00
mashuai 29e15504e9 bmfileinfo类共用移动 2025-02-07 17:15:01 +08:00
mashuai 7636dee74f 功能优化 2025-02-07 17:10:25 +08:00
mashuai 577b8fa34c 功能优化 2025-02-07 17:07:31 +08:00
syruan 80dc08d54e i皖送推送修改 2025-02-06 17:43:02 +08:00
mashuai 2460c18a01 优化 2025-02-06 16:42:13 +08:00
mashuai d35c87033d 优化 2025-02-06 15:21:43 +08:00
syruan fb6c9bfc51 i皖送推送修改 2025-02-06 14:45:13 +08:00
syruan 69b7ac41ed i皖送费用推送审核导出Api 2025-02-06 11:16:04 +08:00
mashuai a5ebc4d727 Merge remote-tracking branch 'origin/master' 2025-01-24 18:03:31 +08:00
mashuai c45378cde5 功能新增及优化 2025-01-24 18:03:26 +08:00
syruan 808b89b332 i皖送推送取消分页,完善删除标记逻辑 2025-01-24 17:58:58 +08:00
syruan ae8560feb7 i皖送推送修改 2025-01-24 17:08:03 +08:00
mashuai c124f9f4fb Merge remote-tracking branch 'origin/master' 2025-01-24 15:53:13 +08:00
mashuai 8ac37a1628 功能新增及优化 2025-01-24 15:53:08 +08:00
hongchao 965b23e254 租赁结算导出对于无数据的增加行,i皖送ruan修改的代码 2025-01-24 15:08:08 +08:00
syruan e226744b47 Merge remote-tracking branch 'origin/master' 2025-01-23 17:51:39 +08:00
syruan 3cf1435a6e i皖送推送修改 2025-01-23 17:51:20 +08:00
mashuai 3218fd90f6 功能新增优化 2025-01-23 17:43:58 +08:00
syruan a9e22710b4 i皖送推送修改 2025-01-23 16:40:53 +08:00
syruan 471bc9af79 i皖送推送修改 2025-01-23 16:13:37 +08:00
syruan ba45c87fb8 i皖送费用推送、Mybatis工程信息拦截器取消 2025-01-23 15:51:16 +08:00
syruan 758cd9f47d 新购验收会签、维修人员 2025-01-23 11:19:05 +08:00
mashuai 4c96c5ab9d 功能优化 2025-01-23 10:10:33 +08:00
mashuai 44a4c0d4a1 功能优化 2025-01-23 09:50:35 +08:00
mashuai 6a66e48eab Merge remote-tracking branch 'origin/master' 2025-01-23 09:49:10 +08:00
mashuai 3ca213b4a1 功能优化 2025-01-23 09:49:01 +08:00
hongchao 445b8db21c 新购验收入库和新购验收管理对出厂日期的bug进行修复 2025-01-22 15:11:01 +08:00
mashuai a3b562a77c Merge remote-tracking branch 'origin/master' 2025-01-22 09:38:42 +08:00
mashuai 93690125a3 功能优化 2025-01-22 09:38:30 +08:00
hongchao 223f737ec3 配件管理,报废原因功能优化 2025-01-21 16:37:30 +08:00
syruan 422831bc0d 新购验收绑定会签人员去重 2025-01-21 13:43:26 +08:00
syruan e10c3f6330 新购验收单修改 2025-01-21 11:06:14 +08:00
mashuai 1b60cf6927 配件 2025-01-20 18:21:03 +08:00
hongchao 2c7d7b1da1 结算审批 2025-01-20 17:14:23 +08:00
mashuai ac92f47acb 配件移包part 2025-01-20 09:26:50 +08:00
mashuai bfde5717d3 文件功能修改 2025-01-17 18:57:46 +08:00
syruan 8b4e9a9184 新购验收会签流程增加,验收单修改 2025-01-17 18:12:46 +08:00
mashuai b14bed4d9a Merge remote-tracking branch 'origin/master' 2025-01-17 15:53:19 +08:00
mashuai f986162a4c 维修报废功能修改 2025-01-17 15:53:14 +08:00
hongchao 0f4478adc8 会签流程配置管理 2025-01-17 15:20:04 +08:00
mashuai a649d4f520 Merge remote-tracking branch 'origin/master' 2025-01-17 13:01:25 +08:00
mashuai 30bf793f34 维修报废功能修改 2025-01-17 13:01:14 +08:00
hongchao f3f8dc0e85 退料审核人签名 2025-01-17 11:03:29 +08:00
mashuai 26c6415877 Merge remote-tracking branch 'origin/master' 2025-01-16 19:17:18 +08:00
mashuai c4461f3b91 维修报废功能修改 2025-01-16 19:17:10 +08:00
hongchao dcdf35762c 领料管理领料单审核签名 2025-01-16 18:06:58 +08:00
hongchao 64be877da7 会签配置管理 2025-01-16 15:37:25 +08:00
hongchao b28a993067 对没有数据的结算提交bug修复 2025-01-16 09:31:11 +08:00
hongchao 4cf7c2e397 结算申请(单个)详情,四项导出以及融合导出,提交结算 2025-01-16 09:26:20 +08:00
mashuai 8109f4b9d2 维修功能修改 2025-01-15 17:34:00 +08:00
mashuai 85207c254d 功能修改 2025-01-14 18:47:36 +08:00
mashuai fd34a180ae 功能修改 2025-01-14 16:59:36 +08:00
mashuai 7cbac2f99e 功能修改 2025-01-14 16:57:44 +08:00
mashuai 129550fa13 功能修改 2025-01-13 18:03:20 +08:00
syruan cce2ddf4f9 新购验收导出修改 2025-01-13 10:27:36 +08:00
mashuai 6c481ff197 ces 2025-01-13 10:06:11 +08:00
mashuai cdaef46889 报废 2025-01-13 09:39:44 +08:00
mashuai 2d68d8d410 退料定时任务 2025-01-10 17:54:09 +08:00
mashuai c9ad9a1377 Merge remote-tracking branch 'origin/master' 2025-01-10 17:51:55 +08:00
mashuai 3d6a274eed 优化 2025-01-10 17:51:49 +08:00
syruan 4e3edf2cb2 新购实现拆分多次入库,状态流转优化 2025-01-10 17:47:41 +08:00
hongchao 12bb2ed637 相关配套文件 2025-01-10 15:42:08 +08:00
syruan 2e6c4d6a32 新购逻辑修改 2025-01-10 15:31:15 +08:00
syruan d75a7fbc24 BUG修改 2025-01-10 14:11:26 +08:00
syruan 476eaf3a81 标准箱绑定新购批次判断 2025-01-10 14:07:24 +08:00