Commit Graph

2083 Commits

Author SHA1 Message Date
syruan 1f3c3bc460 协议书编号 2026-01-21 13:49:24 +08:00
mashuai f917407328 优化 2026-01-20 19:36:02 +08:00
jiask 373229a416 jsk 出库台账添加 分公司-领用单位-工程名称 过滤条件 2026-01-20 16:29:18 +08:00
itcast dc0e239761 往来单位新增修改 2026-01-20 15:08:23 +08:00
jiask 2938014a24 jsk lease_out_details 添加 box_code 2026-01-19 18:41:36 +08:00
jiask 8e9f858e52 jsk lease_out_details添加boxId 2026-01-19 18:30:32 +08:00
mashuai e365cae41c 优化 2026-01-19 17:34:24 +08:00
itcast d47ca17451 Merge remote-tracking branch 'origin/master' 2026-01-19 17:32:08 +08:00
itcast 26f3dcca79 基础管理 2026-01-19 17:31:57 +08:00
hongchao 410949d503 退料接收问题修复 2026-01-19 17:21:13 +08:00
hongchao 7cd4c29ee5 退料接收问题修复 2026-01-19 16:46:09 +08:00
mashuai 54b97f181a 优化 2026-01-19 16:19:43 +08:00
hayu 28fa63e904 优化 2026-01-19 15:55:20 +08:00
mashuai 6fcbd94f11 优化 2026-01-19 15:54:24 +08:00
bonus 0231533530 数据所属组织修改 2026-01-16 18:03:54 +08:00
itcast e4789dd930 新购通知 2026-01-16 17:44:14 +08:00
mashuai a98c39a2df 优化 2026-01-16 16:51:30 +08:00
itcast 66bba04673 Merge remote-tracking branch 'origin/master' 2026-01-16 15:00:27 +08:00
itcast 970f65f962 盘点入库,入库出库查询 2026-01-16 15:00:08 +08:00
hongchao 13df76c18c 预警分析 2026-01-16 14:58:43 +08:00
syruan 9042c13c4c 协议书编号 2026-01-15 18:17:57 +08:00
hongchao b3f45b178b Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2026-01-15 17:34:33 +08:00
hongchao fab03a0f3d 问题修复 2026-01-15 17:34:10 +08:00
itcast 22a3ad16ff 修试审核导出新增试验数量 2026-01-15 17:05:02 +08:00
hongchao 6885b17f6d 费用推送下拉 2026-01-15 16:10:25 +08:00
mashuai 639cdc3af7 优化 2026-01-15 14:12:00 +08:00
syruan 6c7bf4bf72 费用减免调整 2026-01-15 13:59:14 +08:00
syruan 0c2cf7ac71 费用减免调整 2026-01-15 13:58:15 +08:00
hayu aaed24ffcb 优化 2026-01-15 13:50:00 +08:00
mashuai e86f1aa88d 优化 2026-01-15 10:58:11 +08:00
jiask db80268cb9 jsk 领料退料查询 完善 2026-01-14 22:17:29 +08:00
hayu 589ad3b135 优化 2026-01-14 18:06:04 +08:00
jiask 76af0c8d07 JSK 新购完善 2026-01-14 17:47:19 +08:00
mashuai 724d9214eb Merge remote-tracking branch 'origin/master' 2026-01-14 17:44:13 +08:00
mashuai 54f9453f24 优化 2026-01-14 17:43:09 +08:00
liux da7052f4bb 测试问题修复 2026-01-14 17:32:03 +08:00
jiask f542f7cc79 jsk 退料查询 2026-01-14 16:10:38 +08:00
jiask 6ca468fbf1 jsk 领料查询 2026-01-14 15:52:16 +08:00
mashuai 03e3493bdb 优化 2026-01-14 15:22:48 +08:00
mashuai f2dc29fa13 优化 2026-01-14 11:14:37 +08:00
mashuai ff6e83188f 优化 2026-01-14 11:11:46 +08:00
hayu 7eb024869a 5号库改造 2026-01-14 09:59:27 +08:00
liux 03232682f8 测试问题修复 2026-01-14 09:44:23 +08:00
hayu 701ae14817 5号库改造 2026-01-13 17:55:24 +08:00
jiask c904874535 jsk 新购驳回统计数量修正 2026-01-13 16:14:09 +08:00
mashuai 382701e9b9 Merge remote-tracking branch 'origin/master' 2026-01-13 15:42:04 +08:00
mashuai d735f63b5d 优化 2026-01-13 15:41:55 +08:00
jiask f194030741 jsk 驳回任务,待入库数量设为0 2026-01-13 15:19:11 +08:00
bonus c5dced169b 协议书收费查询 2026-01-13 13:39:01 +08:00
hayu fc2e85c832 5号库改造,机具库存查询 2026-01-12 18:12:35 +08:00
mashuai d802b903af Merge remote-tracking branch 'origin/master' 2026-01-12 11:21:05 +08:00
mashuai 273e0af612 工地直转优化 2026-01-12 11:20:58 +08:00
hayu 4312800e64 5号库改造,机具库存查询 2026-01-12 11:20:38 +08:00
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