Commit Graph

948 Commits

Author SHA1 Message Date
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
mashuai cbf86d3d75 优化 2025-01-10 14:04:43 +08:00
syruan 599a8c2767 QRcode新增设备状态 2025-01-10 11:17:54 +08:00
syruan ee4b132a2c 退料单电子签名、维修审核修改 2025-01-10 09:47:54 +08:00
hongchao 9313ac3c2d 配件管理 2025-01-10 08:57:49 +08:00
syruan 4093544cb5 领料单电子签名 2025-01-09 11:13:03 +08:00
mashuai abeee55b83 优化 2025-01-08 18:17:06 +08:00
syruan e8db3d7f9c 物资类型修改 2025-01-08 15:54:47 +08:00
mashuai eb8fefed2e Merge remote-tracking branch 'origin/master' 2025-01-08 13:33:50 +08:00
mashuai 0f8d6fed11 优化 2025-01-08 13:33:45 +08:00
hongchao e53e53c39e 报废原因管理 2025-01-07 18:38:35 +08:00
mashuai 3b45aa9e0f 问题优化 2025-01-07 18:19:47 +08:00
mashuai 6f0f9c06f6 新购优化 2025-01-07 16:44:32 +08:00
mashuai 718479acd8 二维码优化 2025-01-03 16:38:05 +08:00
mashuai 711b3ba64d 二维码优化 2025-01-03 16:29:25 +08:00
mashuai b4e3a03c9b 报废优化 2025-01-03 15:06:19 +08:00
mashuai ba3fc88ce0 报废+ocr 2025-01-03 14:07:12 +08:00
mashuai 5fa102fc3d 报废审核 2025-01-02 10:55:57 +08:00
syruan 12a0487ccb Merge remote-tracking branch 'origin/master' 2024-12-31 17:27:41 +08:00
syruan 074ae903cb 维修代码规范修改 2024-12-31 17:27:27 +08:00
mashuai af02b8ed31 二维码 2024-12-31 17:15:07 +08:00
syruan 5198fea5d4 优化维修逻辑 2024-12-31 16:58:28 +08:00
mashuai 7b1f0f2291 bug优化 2024-12-30 17:58:00 +08:00
mashuai 3d28f3ebe1 bug优化 2024-12-27 18:52:03 +08:00
mashuai 3680bf221a 领料关联库管 2024-12-27 18:35:02 +08:00
syruan ca817bb3ab 新购验收绑定 2024-12-27 18:22:58 +08:00
mashuai eb3cc94fbb 电子档案 2024-12-27 17:06:55 +08:00
hongchao b686d92f9d Merge remote-tracking branch 'origin/master' 2024-12-27 13:13:44 +08:00
hongchao 9cd74b5bc1 单位类型管理导出和查询接口重写 2024-12-27 13:12:16 +08:00
syruan d739a97399 新购税率计算修改 2024-12-27 11:02:56 +08:00
mashuai badc7cd064 Merge remote-tracking branch 'origin/master' 2024-12-27 09:32:13 +08:00
mashuai cddb0b9a8d 接口优化 2024-12-27 09:32:07 +08:00
syruan 114b90daa3 标准箱代码规范修改 2024-12-27 09:27:35 +08:00
mashuai b065f30d77 接口修改 2024-12-26 18:47:11 +08:00
mashuai e09a530cff 接口修改 2024-12-26 18:21:15 +08:00
syruan 4493caf705 新购验收绑定逻辑优化 2024-12-26 18:10:24 +08:00
syruan 660c43592b 维修、维修审核、报废修改 2024-12-26 17:10:21 +08:00
mashuai 1168a16fed 接口联调 2024-12-26 15:17:59 +08:00
mashuai 55ce855d68 接口联调 2024-12-26 14:38:33 +08:00
mashuai 57bade227a 接口联调 2024-12-26 12:41:39 +08:00
syruan 821883ad8d Merge remote-tracking branch 'origin/master' 2024-12-25 19:01:18 +08:00
syruan 71678dded4 新购绑定逻辑修改 2024-12-25 19:01:03 +08:00
mashuai 44493ddc66 接口联调 2024-12-25 18:33:19 +08:00
syruan 53b3d571db 标准箱入库逻辑修改、维修逻辑修改、QRCODE新查询接口开发 2024-12-25 18:19:23 +08:00
mashuai 6ced630d20 接口联调 2024-12-25 14:32:34 +08:00
mashuai d112ee1e81 接口联调 2024-12-25 13:53:04 +08:00
syruan 3fa849fa98 新购验收绑定修改 2024-12-24 19:30:58 +08:00
mashuai 022052d82b 接口联调优化 2024-12-24 18:50:06 +08:00
mashuai 3954484bb3 接口联调优化 2024-12-24 18:32:18 +08:00
mashuai 948d56c889 设备管理 2024-12-24 14:10:56 +08:00
mashuai 062de4984b 设备管理 2024-12-24 13:29:36 +08:00
mashuai 33d6c3bbd1 先下载二维码,绑定编码后处理 2024-12-24 11:28:33 +08:00
syruan 93bc93b103 新购二维码表替换 2024-12-24 10:59:54 +08:00
mashuai c29c23c38c 二维码下载 2024-12-24 10:42:20 +08:00
mashuai db2b4b9e3e Merge remote-tracking branch 'origin/master' 2024-12-24 10:06:03 +08:00
mashuai bdcbca4563 设备追溯修改 2024-12-24 10:05:57 +08:00
syruan e0c900cad8 新购倒序、增加状态筛选 2024-12-23 17:57:47 +08:00
syruan 0692590215 新购任务管理、验收、绑定、入库展示方式修改、新增阶段 2024-12-23 16:50:41 +08:00
bonus 9311d8c0e9 新购绑定查询二维码接口 2024-12-23 15:16:58 +08:00
bonus 2b95ca3d80 Merge remote-tracking branch 'origin/master' 2024-12-23 15:14:57 +08:00
mashuai 4532662c40 领料修改 2024-12-23 14:36:57 +08:00
mashuai 9cd60c3e1a 领料修改 2024-12-23 14:06:52 +08:00
bonus d1b1bc3853 删除post类型 2024-12-23 13:29:15 +08:00
mashuai 62443b4c8f 库存日志记录 2024-12-20 21:11:36 +08:00
mashuai 1bcd5b8993 库存日志记录 2024-12-20 19:46:20 +08:00
syruan e710a3df1c 标准箱状态判断修改 2024-12-20 18:04:57 +08:00
mashuai 9bc1d7c28c 优化 2024-12-20 17:56:25 +08:00
mashuai 15712e9610 优化 2024-12-20 17:38:02 +08:00
syruan 5dc324fa62 二维码标准箱--扫码入库机具 2024-12-20 16:44:12 +08:00
mashuai fbf72c2f89 公用实体类移动 2024-12-20 16:39:22 +08:00
mashuai 224b71336d 新购及标准箱出库页面详情 2024-12-20 16:14:23 +08:00
syruan 2cfd473981 二维码标准箱完善校验 2024-12-20 14:03:41 +08:00
syruan 82669b3136 二维码标准箱修改 2024-12-20 14:01:09 +08:00
syruan bc2c414a61 Merge remote-tracking branch 'origin/master' 2024-12-20 13:29:19 +08:00
syruan e728414713 标准箱查询 2024-12-20 13:18:35 +08:00
mashuai 136fa84384 综合查询二级页面详情 2024-12-20 13:02:17 +08:00
syruan 0fcb6fec5d 二维码标准箱APP接口开发 2024-12-20 10:52:01 +08:00
mashuai 1904789a0f 优化 2024-12-19 14:48:12 +08:00
mashuai dc63eb8bf1 优化 2024-12-19 13:53:47 +08:00
syruan 0f582a0d68 维修管理优化 2024-12-18 18:00:13 +08:00
mashuai dd0dc21126 综合查询 2024-12-18 17:56:45 +08:00
mashuai 3fb4ac8d17 机具出库查询 2024-12-18 13:24:57 +08:00
mashuai e5e2b286b2 机具入库查询 2024-12-18 09:15:58 +08:00
mashuai c961c0c3c6 修饰优化 2024-12-17 16:58:29 +08:00
syruan 89ed25dc38 维修提交单号重新生成 2024-12-17 15:57:17 +08:00
mashuai 054f0bdeb6 库存日志调整 2024-12-17 14:16:14 +08:00
mashuai 8956bf67b0 综合查询 2024-12-17 09:36:17 +08:00
mashuai 7cf78012b0 综合查询 2024-12-17 09:34:07 +08:00
mashuai 5c0f5e4173 修饰后入库 2024-12-16 09:21:06 +08:00
mashuai fcd224db8f 修饰后入库 2024-12-13 17:25:52 +08:00