Commit Graph

2023 Commits

Author SHA1 Message Date
mashuai ac0646df6b 优化 2026-01-12 10:09:03 +08:00
itcast 4ded4d7b97 未结算报表 2026-01-12 09:45:28 +08:00
mashuai fc40e4af1f 立体库 2026-01-10 21:23:53 +08:00
mashuai 36dd02f46d 标准箱 2026-01-10 21:21:51 +08:00
mashuai 58ed645a64 标准箱 2026-01-10 21:15:35 +08:00
itcast 2da9fa931b Merge remote-tracking branch 'origin/master' 2026-01-09 18:06:25 +08:00
itcast 38b7f3bea7 结算管理 2026-01-09 18:06:16 +08:00
hayu 70d1ca586d 5号库改造 2026-01-09 18:06:12 +08:00
hongchao 891cfc3dce Merge remote-tracking branch 'origin/master' 2026-01-09 15:46:31 +08:00
hongchao 62887ff5c7 宏源权限 2026-01-09 15:44:54 +08:00
hayu e1140f5bb8 5号库改造-综合查询 2026-01-09 15:28:35 +08:00
jiask 89e2d0f8f2 jsk 竣工未归还查询-分公司下拉进行权限改造 2026-01-09 15:05:42 +08:00
jiask 2c4db1d75f jsk 检验预警 权限改造 2026-01-09 14:55:25 +08:00
jiask dbf9e35923 jsk 检验预警 权限改造-数字 2026-01-09 14:28:48 +08:00
jiask abe03bef05 jsk 装卸单权限改造 2026-01-09 14:27:51 +08:00
jiask 7fc24398ad jsk 业务办理-装卸单 权限数据改造 2026-01-09 13:34:46 +08:00
jiask d3f5e75133 jsk 综合查询 -供应统计报表 -竣工未归还查询 权限数据改造 2026-01-09 11:15:38 +08:00
jiask de622211a4 jsk 类型规格权限改造 数量变动 2026-01-09 10:49:06 +08:00
jiask a9983a15c6 JSK 物资厂家权限改造 2026-01-09 10:48:02 +08:00
itcast 000de8eafc Merge remote-tracking branch 'origin/master' 2026-01-09 10:19:56 +08:00
mashuai ca91951233 优化 2026-01-09 10:14:11 +08:00
itcast 890934ada4 Merge remote-tracking branch 'origin/master' 2026-01-09 10:13:49 +08:00
itcast fb3938a1a3 基础管理 2026-01-09 10:12:11 +08:00
hayu 5b3b82a292 5号库改造 2026-01-09 10:06:19 +08:00
hayu 7790c6479d 5号库改造 2026-01-09 10:05:55 +08:00
hongchao ba18d88a9d Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2026-01-09 09:57:38 +08:00
hongchao da537f966a 宏源权限 2026-01-09 09:57:24 +08:00
mashuai 142f011ab7 优化 2026-01-09 09:57:10 +08:00
jiask e9eeaffa11 jsk 机具库存查询 权限改造 2026-01-08 16:59:34 +08:00
jiask b84d468e49 jsk ma_machine 检验预警权限改造 2026-01-08 16:58:00 +08:00
jiask 033019224b jsk 新购到货管理 数据权限改造 2026-01-08 16:51:57 +08:00
hongchao aaaa60c517 获取用户deptId 2026-01-07 15:28:37 +08:00
hongchao d767bc22b6 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
# Conflicts:
#	bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java
#	bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java
#	bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
2026-01-07 14:47:37 +08:00
hongchao 121c207b74 获取用户deptId 2026-01-07 14:46:27 +08:00
mashuai 9632a36b63 优化 2026-01-07 14:30:01 +08:00
hongchao 3bf0bb85bf 减免审核 2026-01-06 16:40:01 +08:00
hongchao e1760ce857 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2026-01-06 16:20:39 +08:00
hongchao 8fd7b25de3 减免审核 2026-01-06 16:20:16 +08:00
bonus 39b4769a57 推送费用显示负数 2026-01-06 11:31:56 +08:00
hayu 7da8fe1173 优化:编码设备报废存储费用 2026-01-06 10:18:09 +08:00
hongchao 650afdb89f 问题修复 2026-01-04 09:13:12 +08:00
mashuai 3d18957cbf 新购及修试入库立体仓调试 2025-12-31 23:30:05 +08:00
bonus 5a8808b2c4 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2025-12-30 18:12:19 +08:00
bonus 4f9092ab13 修改定时器存储 2025-12-30 18:11:49 +08:00
mashuai 8585f4ade8 新购及修试入库立体仓调试 2025-12-30 17:03:22 +08:00
mashuai 8f9127f2be 字段优化 2025-12-30 17:01:15 +08:00
bonus e5c4d96560 结算审核协议合并修改 2025-12-30 16:16:48 +08:00
hayu ea45488670 维修记录重复及价格计算优化 2025-12-30 12:24:59 +08:00
mashuai e620c2254c 立体仓出库 2025-12-29 17:43:07 +08:00
mashuai a6e1d9e2b8 优化 2025-12-29 17:41:53 +08:00
mashuai 73c64cf1ab 立体仓标准箱 2025-12-29 17:38:54 +08:00
mashuai 349f2493cf 优化 2025-12-18 16:45:17 +08:00
bonus 3cef269a7a 结算修改 2025-12-17 11:25:15 +08:00
hayu a065b8ecde 报告一键下载功能优化 2025-12-15 10:37:06 +08:00
bonus 59d22c923a 直转提交默认source=1 2025-12-12 10:29:18 +08:00
mashuai 22a2bac03f 优化 2025-12-11 16:20:49 +08:00
mashuai aa9fbe8759 结算页面优化 2025-12-11 13:17:21 +08:00
hayu 16f385fb5b 报告查询一键下载 2025-12-10 19:20:14 +08:00
mashuai c3359b8e2e 优化 2025-12-10 17:16:19 +08:00
hongchao 88d1c12a64 未结算报表zip导出 2025-12-10 17:04:39 +08:00
mashuai e298c589cf 推送优化及皖送接口及班组审批优化 2025-12-10 10:52:30 +08:00
hayu d3753a9a34 报告查询一键下载 2025-12-10 09:18:23 +08:00
bonus 292fa1945c 安全工器具推送修改 2025-12-08 18:33:01 +08:00
bonus 53adca0c4c 结算维修单修改 2025-12-08 18:26:52 +08:00
hongchao c7d5cc2303 结算 2025-12-08 18:04:18 +08:00
hongchao fa2695bf04 结算 2025-12-08 17:07:38 +08:00
bonus 9e9a455756 结算协议书小数向上取整 2025-12-08 15:55:24 +08:00
hongchao a11b19e93c 问题修复 2025-12-05 17:43:45 +08:00
hongchao 334bde0d33 问题修复 2025-12-05 17:41:48 +08:00
hongchao e2ed0e7e6d 问题修复 2025-12-05 17:14:20 +08:00
hongchao 50f7448b64 问题修复 2025-12-05 15:41:42 +08:00
bonus fed0467d2a 结算明细修改 2025-12-04 12:18:03 +08:00
mashuai eb9f571239 优化 2025-12-03 16:08:23 +08:00
bonus 4631cec07c 综合查下在用详细修改 2025-12-03 16:05:45 +08:00
hongchao e495597f4e 安全工器具的协议包含机具,不能发布 2025-12-03 14:59:35 +08:00
mashuai c6365050e3 短信优化 2025-12-01 17:56:38 +08:00
mashuai a575b43694 查询优化 2025-12-01 11:06:57 +08:00
mashuai 66d88e59c9 查询优化 2025-12-01 11:06:35 +08:00
mashuai 7e6a9a3c83 检验标识查询 2025-12-01 09:41:47 +08:00
mashuai 9f59f802ca 丢失报备 2025-11-28 16:21:57 +08:00
bonus 1cdae3a38b 结算权限取消 2025-11-28 15:18:17 +08:00
hongchao c558165778 工程已结算未结算字段添加 2025-11-27 17:40:47 +08:00
hongchao 915aad6e51 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2025-11-26 17:48:25 +08:00
hongchao 2c587b40d4 导出zip修改进度接口 2025-11-26 17:48:10 +08:00
mashuai b9e55c1619 领料需求发布量更改 2025-11-26 14:19:33 +08:00
mashuai ca6e97dab7 球机定位 2025-11-26 14:18:55 +08:00
bonus a6d2ea97a8 皖送大屏机具maCode入参 2025-11-25 17:09:32 +08:00
bonus f596d34c59 皖送大屏机具工程id推送 2025-11-25 14:52:50 +08:00
bonus 62b88c6ed6 皖送大屏机具编码信息推送 2025-11-25 10:28:51 +08:00
mashuai 70fd7ac0cc 项目部退料及直转优化 2025-11-24 17:03:33 +08:00
hongchao 86be0b78d0 工程竣工未归还查询 2025-11-24 14:21:09 +08:00
mashuai cbc4faa3d6 Merge remote-tracking branch 'origin/master' 2025-11-21 15:24:11 +08:00
mashuai 265416db6c 优化 2025-11-21 15:24:04 +08:00
hongchao 5232ed983d Merge remote-tracking branch 'origin/master' 2025-11-21 15:08:37 +08:00
hongchao d414d83eb3 zip批量导出 2025-11-21 15:08:21 +08:00
mashuai 769571e04b 优化 2025-11-21 15:06:46 +08:00
hongchao 5710e539a6 Merge remote-tracking branch 'origin/master' 2025-11-20 14:35:58 +08:00
hongchao c6c6e37496 供应功能 2025-11-20 14:35:40 +08:00
mashuai d9ccc42c98 工程页面增加分公司字段 2025-11-20 14:33:20 +08:00
hongchao 90853274b2 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2025-11-20 09:10:01 +08:00