 sxu
|
819db25805
|
Merge remote-tracking branch 'origin/master'
|
2024-11-14 09:59:34 +08:00 |
|
sxu
|
9ec98894af
|
领料接口优化
|
2024-11-14 09:57:49 +08:00 |
syruan
|
bd685be698
|
Merge remote-tracking branch 'origin/branch_syruan'
|
2024-11-14 09:57:32 +08:00 |
 mashuai
|
1e4fb18018
|
退料管理
|
2024-11-13 18:53:14 +08:00 |
|
sxu
|
3806ae330a
|
合并领料代码
|
2024-11-13 18:26:33 +08:00 |
|
mashuai
|
be2c9ff8a3
|
退料管理
|
2024-11-13 18:01:55 +08:00 |
|
syruan
|
7903d8ff96
|
领料管理--领料任务状态枚举定义
|
2024-11-13 17:20:24 +08:00 |
|
syruan
|
594c8872a9
|
领料管理--领料任务批量发布
|
2024-11-13 17:04:13 +08:00 |
|
sxu
|
77af9c7fe0
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 16:48:07 +08:00 |
|
syruan
|
b099235b48
|
领料管理--增加事务、异常处理
|
2024-11-13 16:45:17 +08:00 |
|
syruan
|
edafce611a
|
领料管理--领料任务发布、新增枚举内容
|
2024-11-13 16:41:05 +08:00 |
|
sxu
|
279c5a284d
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 16:24:49 +08:00 |
|
sxu
|
22cf285bd2
|
领料接口优化
|
2024-11-13 16:23:54 +08:00 |
|
sxu
|
cb4bf886df
|
领料接口优化
|
2024-11-13 16:02:59 +08:00 |
|
syruan
|
4c9970886f
|
领料管理--去除冗余代码、增加导出字段
|
2024-11-13 15:54:52 +08:00 |
|
sxu
|
2fbd4e7466
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 15:42:13 +08:00 |
|
sxu
|
1fdf3a8e08
|
领料接口优化
|
2024-11-13 15:41:40 +08:00 |
|
syruan
|
67e842c62f
|
领料管理--优化修改领料任务逻辑
|
2024-11-13 15:31:48 +08:00 |
|
sxu
|
e18a20bf1b
|
领料接口优化
|
2024-11-13 15:20:20 +08:00 |
|
sxu
|
3db75704c5
|
领料接口优化
|
2024-11-13 14:54:06 +08:00 |
|
syruan
|
19cba7f73e
|
领料管理--优化领料逻辑
|
2024-11-13 14:34:00 +08:00 |
|
sxu
|
9270ff772a
|
领料接口优化
|
2024-11-13 14:27:18 +08:00 |
|
sxu
|
4256b1b387
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 14:02:27 +08:00 |
|
sxu
|
04cbd6f5bd
|
领料接口优化
|
2024-11-13 14:01:49 +08:00 |
|
syruan
|
b7eeee7bef
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 13:57:20 +08:00 |
|
syruan
|
9886edfc1a
|
领料管理--修改字段类型
|
2024-11-13 13:57:05 +08:00 |
|
sxu
|
8372096fb9
|
领料接口优化
|
2024-11-13 13:43:38 +08:00 |
|
sxu
|
8c5b409fbd
|
领料接口优化
|
2024-11-13 13:36:06 +08:00 |
|
sxu
|
4c998e6391
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 12:24:08 +08:00 |
|
sxu
|
786ee8d784
|
领料接口优化
|
2024-11-13 12:23:35 +08:00 |
|
syruan
|
4584aed981
|
领料管理--修改字段类型
|
2024-11-13 11:23:19 +08:00 |
|
syruan
|
9f2ed65b7d
|
领料管理--冗余优化、新增字段
|
2024-11-13 11:16:25 +08:00 |
|
syruan
|
f5ec21f675
|
领料管理--详情查询
|
2024-11-13 11:11:57 +08:00 |
|
syruan
|
13fb09a171
|
领料管理--详情查询
|
2024-11-13 11:08:34 +08:00 |
|
sxu
|
bf6fadcdd6
|
领料接口优化
|
2024-11-13 10:48:38 +08:00 |
|
sxu
|
a1b0cb45f9
|
领料接口优化
|
2024-11-13 10:45:03 +08:00 |
|
sxu
|
0fba5ce68e
|
领料接口优化
|
2024-11-13 10:42:01 +08:00 |
|
sxu
|
9ff5a9958c
|
fix conflict
|
2024-11-13 10:39:40 +08:00 |
|
sxu
|
b223d2340b
|
领料接口优化
|
2024-11-13 10:37:17 +08:00 |
|
sxu
|
01d1b9b60e
|
领料接口优化
|
2024-11-13 10:35:12 +08:00 |
|
sxu
|
d4db651eec
|
领料接口优化
|
2024-11-13 10:19:50 +08:00 |
|
syruan
|
68b728275f
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 10:15:20 +08:00 |
|
syruan
|
be257b1912
|
领料管理--关联查询
|
2024-11-13 10:15:03 +08:00 |
|
sxu
|
dfdf56a8c8
|
领料接口优化
|
2024-11-13 09:57:43 +08:00 |
|
sxu
|
e244ebed75
|
领料接口优化
|
2024-11-13 09:47:36 +08:00 |
|
sxu
|
ec9e196433
|
领料接口优化
|
2024-11-13 09:44:07 +08:00 |
|
sxu
|
4e3520aa3d
|
领料接口优化
|
2024-11-13 09:30:23 +08:00 |
|
syruan
|
e31a4eec89
|
维修管理
|
2024-11-13 09:06:48 +08:00 |
|
sxu
|
a24d84e624
|
领料接口优化
|
2024-11-13 07:07:27 +08:00 |
|
sxu
|
8cdbb77ab2
|
领料接口优化
|
2024-11-12 18:53:33 +08:00 |
|
sxu
|
77535090a0
|
领料接口优化
|
2024-11-12 18:25:46 +08:00 |
|
sxu
|
21249c4d74
|
领料接口优化
|
2024-11-12 16:02:02 +08:00 |
|
sxu
|
aec9b5b3f6
|
领料接口优化
|
2024-11-12 15:21:49 +08:00 |
|
sxu
|
59febbed55
|
领料接口优化
|
2024-11-12 14:55:54 +08:00 |
|
sxu
|
e6bbc44f9b
|
领料接口优化
|
2024-11-12 14:44:31 +08:00 |
|
sxu
|
663a871b56
|
领料接口优化
|
2024-11-12 14:39:02 +08:00 |
|
sxu
|
156b6f07a9
|
领料接口优化
|
2024-11-12 14:18:42 +08:00 |
|
sxu
|
9dcbb8d6fb
|
下拉接口优化
|
2024-11-12 12:55:48 +08:00 |
|
sxu
|
9773d67b20
|
下拉接口优化
|
2024-11-12 12:45:36 +08:00 |
|
sxu
|
ec70fa6026
|
下拉接口优化
|
2024-11-12 12:41:27 +08:00 |
|
sxu
|
92a114ca26
|
下拉接口优化
|
2024-11-12 12:20:43 +08:00 |
|
sxu
|
720f2699ff
|
领料接口优化
|
2024-11-12 11:13:59 +08:00 |
|
sxu
|
1eac2dc685
|
新购接口优化
|
2024-11-12 10:43:59 +08:00 |
|
sxu
|
413d8a0e89
|
新购接口优化
|
2024-11-12 10:18:37 +08:00 |
|
sxu
|
1beca0b8c9
|
新购接口优化
|
2024-11-12 09:27:25 +08:00 |
|
sxu
|
39739efcad
|
配置接口优化
|
2024-11-11 18:27:16 +08:00 |
|
sxu
|
6ef09675dd
|
领料接口优化
|
2024-11-11 17:54:29 +08:00 |
|
sxu
|
dbe78893be
|
协议接口优化
|
2024-11-11 17:10:57 +08:00 |
|
sxu
|
bc38149902
|
协议接口优化
|
2024-11-11 16:27:02 +08:00 |
|
sxu
|
cb814d18b5
|
协议接口优化
|
2024-11-11 16:06:47 +08:00 |
|
sxu
|
a1556100d2
|
协议接口优化
|
2024-11-11 15:54:57 +08:00 |
|
sxu
|
da248081bc
|
协议接口优化
|
2024-11-11 15:36:36 +08:00 |
|
sxu
|
0992fa22d7
|
新建协议接口
|
2024-11-11 15:22:32 +08:00 |
|
sxu
|
219fa82d64
|
通用select接口
|
2024-11-11 14:51:58 +08:00 |
|
sxu
|
00b06418bf
|
通用select接口
|
2024-11-11 14:00:09 +08:00 |
|
sxu
|
b4bab9459e
|
领料接口优化
|
2024-11-11 10:18:32 +08:00 |
|
sxu
|
04fee2f74a
|
领料接口优化
|
2024-11-11 10:08:01 +08:00 |
|
sxu
|
b205004268
|
配置列表接口优化
|
2024-11-11 09:53:19 +08:00 |
|
sxu
|
2945d80550
|
配置列表接口优化
|
2024-11-11 09:02:08 +08:00 |
|
sxu
|
fa774474aa
|
配置列表接口优化
|
2024-11-10 22:02:11 +08:00 |
|
sxu
|
672d11e239
|
新购接口优化合并
|
2024-11-10 21:41:12 +08:00 |
|
sxu
|
70ee9d114a
|
配置列表接口优化
|
2024-11-09 20:50:27 +08:00 |
|
sxu
|
06dbf00c04
|
配置列表接口优化
|
2024-11-09 19:59:25 +08:00 |
|
sxu
|
f3bedea63b
|
配置列表接口优化
|
2024-11-09 18:10:09 +08:00 |
|
sxu
|
36adb269e9
|
配置列表接口优化
|
2024-11-08 17:22:16 +08:00 |
|
sxu
|
454a69b7ae
|
新购列表接口优化
|
2024-11-08 17:18:38 +08:00 |
|
sxu
|
f4f830d7ff
|
新购列表接口优化
|
2024-11-08 15:51:14 +08:00 |
|
sxu
|
9411a2777f
|
新购接口优化
|
2024-11-08 14:39:27 +08:00 |
|
sxu
|
46d3116c5b
|
新购接口优化
|
2024-11-08 14:34:03 +08:00 |
|
sxu
|
538b15ada1
|
新购接口优化
|
2024-11-08 13:49:47 +08:00 |
|
sxu
|
38ba88e5d3
|
24.11.0-SNAPSHOT
|
2024-11-08 13:47:58 +08:00 |
|
sxu
|
05a0fe410a
|
内存验收接口优化
|
2024-11-08 13:08:26 +08:00 |
|
sxu
|
89f79f9181
|
内存验收接口优化
|
2024-11-08 12:51:46 +08:00 |
|
sxu
|
53d4cff77a
|
验收接口优化
|
2024-11-08 12:24:25 +08:00 |
|
sxu
|
18bb839e02
|
新购接口优化
|
2024-11-08 09:54:17 +08:00 |
|
sxu
|
a22186df3d
|
新购绑定接口优化
|
2024-11-08 09:47:44 +08:00 |
|
sxu
|
d8247d5f38
|
新购详情导出接口优化
|
2024-11-08 09:39:07 +08:00 |
|
sxu
|
24ebbabf86
|
配件接口优化
|
2024-11-07 18:32:23 +08:00 |
|
sxu
|
3641ec942c
|
配件接口优化
|
2024-11-07 18:29:22 +08:00 |
|
sxu
|
f7d336cfc4
|
物资接口优化
|
2024-11-07 18:18:00 +08:00 |
|
sxu
|
035980e849
|
新购接口优化
|
2024-11-07 17:52:25 +08:00 |
|
sxu
|
0c086c2982
|
新购接口优化
|
2024-11-07 17:32:57 +08:00 |
|
sxu
|
1bc0b04d83
|
新购接口优化
|
2024-11-07 17:08:47 +08:00 |
|
sxu
|
a503514fc5
|
新购接口优化
|
2024-11-07 16:17:32 +08:00 |
|
sxu
|
75f8e59e86
|
新购接口优化
|
2024-11-07 14:55:11 +08:00 |
|
sxu
|
2d80a26c48
|
新购接口优化
|
2024-11-07 14:36:23 +08:00 |
|
sxu
|
2cfcff21ec
|
文件接口权限
|
2024-11-07 14:21:55 +08:00 |
|
sxu
|
0d3fe514b8
|
新购附件优化
|
2024-11-07 13:56:29 +08:00 |
|
sxu
|
fbad0e8178
|
新购附件优化
|
2024-11-07 13:17:28 +08:00 |
|
sxu
|
e8e15d6f92
|
新购附件优化
|
2024-11-07 10:56:37 +08:00 |
|
sxu
|
191261d42e
|
新购附件优化
|
2024-11-07 10:39:39 +08:00 |
|
sxu
|
281a73b295
|
新购附件优化
|
2024-11-07 10:33:44 +08:00 |
|
sxu
|
0d2536234f
|
Revert "新购附件优化"
This reverts commit 00e588e8b3.
|
2024-11-07 10:16:24 +08:00 |
|
sxu
|
00e588e8b3
|
新购附件优化
|
2024-11-07 10:05:24 +08:00 |
|
sxu
|
9b2007f8eb
|
新购优化
|
2024-11-07 09:26:21 +08:00 |
|
sxu
|
6e13f55e07
|
厂家优化
|
2024-11-07 09:07:17 +08:00 |
|
sxu
|
cb3e5d0116
|
bmfile优化
|
2024-11-07 09:06:50 +08:00 |
|
sxu
|
2e3516d110
|
物资下拉框出现重复问题
|
2024-11-06 18:49:38 +08:00 |
|
sxu
|
7d18c5641b
|
Revert "物资厂家接口优化"
This reverts commit da4123c8ce.
|
2024-11-06 18:49:08 +08:00 |
|
sxu
|
ca943b0156
|
物资下拉框出现重复问题
|
2024-11-06 17:04:53 +08:00 |
|
sxu
|
5ba84741a0
|
导出matype
|
2024-11-06 16:34:03 +08:00 |
|
sxu
|
39a5e5e9c7
|
导出matype
|
2024-11-06 16:28:43 +08:00 |
|
sxu
|
8e8b6e5842
|
导出repair
|
2024-11-06 16:26:37 +08:00 |
|
sxu
|
a9630165a0
|
导出keeper
|
2024-11-06 16:14:19 +08:00 |
|
sxu
|
916ef67113
|
物资厂家接口优化
|
2024-11-06 15:50:21 +08:00 |
|
sxu
|
da4123c8ce
|
物资厂家接口优化
|
2024-11-06 14:54:42 +08:00 |
|
sxu
|
de40e77d78
|
物资厂家接口优化
|
2024-11-06 14:33:27 +08:00 |
|
sxu
|
aad0e04cac
|
物资厂家接口优化
|
2024-11-06 14:28:52 +08:00 |
|
sxu
|
42ee5fad1c
|
新购通知接口优化
|
2024-11-06 13:51:20 +08:00 |
|
sxu
|
9a10576b8a
|
物资树接口优化
|
2024-11-06 12:09:03 +08:00 |
|
sxu
|
b01b199ed5
|
新购接口优化
|
2024-11-05 18:03:12 +08:00 |
|
sxu
|
3b62cf4c24
|
新购接口优化
|
2024-11-05 17:53:43 +08:00 |
|
sxu
|
a3bab5db4a
|
新购接口优化
|
2024-11-05 17:46:30 +08:00 |
|
sxu
|
ba8c463094
|
新购接口优化
|
2024-11-05 17:38:49 +08:00 |
|
sxu
|
c2eb7afc08
|
新购接口优化
|
2024-11-05 17:31:32 +08:00 |
|
sxu
|
27b36422fe
|
新购接口优化
|
2024-11-05 17:16:46 +08:00 |
|
sxu
|
0b18bac4dd
|
物资类型优化
|
2024-11-05 16:10:55 +08:00 |
|
sxu
|
3cbe0af7d3
|
物资类型优化
|
2024-11-05 15:44:44 +08:00 |
|
sxu
|
c58e9be3dd
|
物资模块优化
|
2024-11-05 14:53:32 +08:00 |
|
sxu
|
7db1794871
|
物资类型优化
|
2024-11-05 11:31:30 +08:00 |
|
sxu
|
3034230451
|
附件表优化
|
2024-11-05 11:04:02 +08:00 |
|
sxu
|
d8283918da
|
仓库信息优化
|
2024-11-04 16:06:31 +08:00 |
|
sxu
|
793482f8ca
|
库管维修绑定关系
|
2024-11-04 14:18:36 +08:00 |
|
sxu
|
b345cb8e52
|
领退料审核流逻辑优化
|
2024-11-01 17:43:58 +08:00 |
|
sxu
|
fb174749d9
|
领退料审核流逻辑优化
|
2024-11-01 17:33:58 +08:00 |
|
sxu
|
d82dccea6d
|
维修员机具关联优化
|
2024-10-31 19:48:07 +08:00 |
|
sxu
|
cd2eeb1b5b
|
维修员机具关联优化
|
2024-10-31 19:46:00 +08:00 |
|
sxu
|
08b66ff0fd
|
库管员机具关联优化
|
2024-10-31 19:38:41 +08:00 |
|
sxu
|
6079c91a89
|
库管员机具关联优化
|
2024-10-31 19:27:07 +08:00 |
|
sxu
|
21fb5e8d87
|
库管员机具关联优化
|
2024-10-31 18:58:21 +08:00 |
|
sxu
|
83da73af7a
|
仓库机具关联优化
|
2024-10-31 18:21:37 +08:00 |
|
sxu
|
bc3e0a06bf
|
库管员绑定查询
|
2024-10-31 17:55:08 +08:00 |
|
sxu
|
ad954969d3
|
Merge remote-tracking branch 'origin/master'
|
2024-10-31 17:49:27 +08:00 |
|
sxu
|
4ac43bd04c
|
库管员绑定查询
|
2024-10-31 17:48:27 +08:00 |
|
mashuai
|
036dc39deb
|
设备清单
|
2024-10-31 15:21:52 +08:00 |
|
sxu
|
5025fd65f9
|
库管员绑定删除
|
2024-10-31 14:34:19 +08:00 |
|
sxu
|
699c505ed8
|
删除多余配置
|
2024-10-31 11:12:20 +08:00 |
|
sxu
|
e2a6f85fc2
|
增加配置接口
|
2024-10-31 09:41:04 +08:00 |
|
sxu
|
4d3c40d9fa
|
厂家优化
|
2024-10-30 16:48:31 +08:00 |
|
sxu
|
61db23f773
|
厂家图片优化
|
2024-10-30 15:22:48 +08:00 |
|
sxu
|
6b73266c1b
|
jar依赖
|
2024-10-30 15:19:21 +08:00 |
|
sxu
|
feae35b2ba
|
营业执照文件上传逻辑优化
|
2024-10-30 13:24:56 +08:00 |
|
sxu
|
6dd54bddc3
|
营业执照文件上传逻辑优化
|
2024-10-30 10:45:31 +08:00 |
|
sxu
|
be0f3ff1a5
|
营业执照文件上传逻辑优化
|
2024-10-30 09:41:25 +08:00 |
|
sxu
|
4e1d425147
|
Merge remote-tracking branch 'origin/master'
|
2024-10-29 17:36:33 +08:00 |
|
sxu
|
af1bb2fb72
|
营业执照文件上传逻辑优化
|
2024-10-29 17:35:48 +08:00 |
|
mashuai
|
6c9a727fe8
|
设备清单
|
2024-10-29 16:42:40 +08:00 |
|
mashuai
|
3dcf2d31de
|
设备清单
|
2024-10-29 16:11:23 +08:00 |
|
sxu
|
9acc8d2c18
|
营业执照文件上传逻辑优化
|
2024-10-29 14:47:19 +08:00 |
|
sxu
|
6cab2772f7
|
营业执照文件上传逻辑优化
|
2024-10-29 14:09:22 +08:00 |
|
sxu
|
e91fa001db
|
营业执照文件上传逻辑优化
|
2024-10-29 13:48:33 +08:00 |
|
sxu
|
225f2b56ef
|
新增供应商优化
|
2024-10-29 11:31:01 +08:00 |
|
sxu
|
3d09568e6c
|
新增公司优化
|
2024-10-29 11:19:50 +08:00 |
|
sxu
|
8d6e049697
|
删无用代码
|
2024-10-29 10:33:49 +08:00 |
|
sxu
|
ac4dd93a16
|
单位绑定人员统计
|
2024-10-29 10:04:25 +08:00 |
|
sxu
|
631ef0aa46
|
仓库导出问题
|
2024-10-29 09:19:04 +08:00 |
|
sxu
|
83f4c03b47
|
Merge remote-tracking branch 'origin/master'
|
2024-10-28 17:47:06 +08:00 |
|
sxu
|
4d601851a2
|
类型树导出问题
|
2024-10-28 17:46:43 +08:00 |
|
mashuai
|
fecf6b31e3
|
往来单位
|
2024-10-28 17:03:39 +08:00 |
|
sxu
|
7cafada98b
|
类型树问题
|
2024-10-28 16:59:27 +08:00 |
|
sxu
|
01b38fd22e
|
类型树问题
|
2024-10-28 16:34:10 +08:00 |
|
sxu
|
30d96d8cad
|
类型树问题
|
2024-10-28 16:19:53 +08:00 |
|
sxu
|
0f7dfd949c
|
Merge remote-tracking branch 'origin/master'
|
2024-10-28 15:31:17 +08:00 |
|
sxu
|
4c9d5f7a4f
|
修复子类型带houseId问题
|
2024-10-28 15:31:05 +08:00 |
|
mashuai
|
370aaa6a8e
|
Merge remote-tracking branch 'origin/master'
|
2024-10-28 15:23:57 +08:00 |
|
mashuai
|
d506fd426a
|
往来单位
|
2024-10-28 15:23:53 +08:00 |
|
sxu
|
e6ab7ce194
|
解决注preventRepeatSubmit解中的问题
|
2024-10-28 14:33:38 +08:00 |
|
sxu
|
925f678827
|
插入wh_house_set，建立仓库和type的关系
|
2024-10-28 14:25:26 +08:00 |
|
sxu
|
de6358d7a7
|
向前端传houseId
|
2024-10-28 14:10:34 +08:00 |
|
sxu
|
4b98e41364
|
Merge branch 'master' of http://192.168.0.56:3000/bonus/Bonus-Cloud-Material
|
2024-10-28 08:59:47 +08:00 |
|
mashuai
|
39f923c6bc
|
合并代码
|
2024-10-25 17:57:45 +08:00 |
|
sxu
|
17fc9dff75
|
Merge remote-tracking branch 'origin/master'
|
2024-10-25 13:22:10 +08:00 |
|
mashuai
|
e1a19795ce
|
工程类型
|
2024-10-25 10:06:08 +08:00 |
|
sxu
|
9e51679064
|
Merge remote-tracking branch 'origin/master'
|
2024-10-24 18:16:53 +08:00 |
|
mashuai
|
bcdc03d944
|
单位类型
|
2024-10-24 18:15:02 +08:00 |
|
sxu
|
c301c710a8
|
Merge remote-tracking branch 'origin/master'
|
2024-10-24 18:03:07 +08:00 |
|
sxu
|
dc59e2e74e
|
Merge remote-tracking branch 'origin/branch_syruan'
|
2024-10-24 18:02:41 +08:00 |
|
syruan
|
fe7fc24510
|
新增新购枚举状态
|
2024-10-24 17:57:53 +08:00 |
|
mashuai
|
cdcbcdf7a7
|
单位类型
|
2024-10-24 17:26:53 +08:00 |
|
mashuai
|
0451872a7d
|
单位类型
|
2024-10-24 17:15:26 +08:00 |
|
mashuai
|
70640139b2
|
单位类型
|
2024-10-24 16:40:25 +08:00 |
|
mashuai
|
0b32de19b3
|
单位
|
2024-10-24 15:40:10 +08:00 |
|
mashuai
|
1648e6a51f
|
单位
|
2024-10-24 15:21:58 +08:00 |
|
mashuai
|
74a12d689e
|
单位
|
2024-10-24 15:12:01 +08:00 |
|
mashuai
|
35a29fab8c
|
单位
|
2024-10-24 15:05:21 +08:00 |
|
mashuai
|
bf47ea3891
|
单位
|
2024-10-24 13:53:24 +08:00 |
|
mashuai
|
95decb8895
|
单位
|
2024-10-24 13:52:27 +08:00 |
|
mashuai
|
5d7116b4f0
|
单位
|
2024-10-24 13:17:43 +08:00 |
|
mashuai
|
e14b2d3754
|
代码合并
|
2024-10-23 19:12:36 +08:00 |
|
mashuai
|
a926edc370
|
Merge branch 'master' into branch_basic
|
2024-10-23 19:11:41 +08:00 |
|
mashuai
|
253b671b25
|
配置类定义
|
2024-10-23 19:10:07 +08:00 |
|
mashuai
|
d099d92758
|
配置类定义
|
2024-10-23 19:02:45 +08:00 |
|
mashuai
|
098adb4af9
|
配置类定义
|
2024-10-23 19:01:00 +08:00 |
|
sxu
|
632947357e
|
Merge branch 'branch_basic'
|
2024-10-23 18:16:30 +08:00 |
|
sxu
|
1a1a97552c
|
Merge remote-tracking branch 'origin/master'
|
2024-10-23 17:57:59 +08:00 |
|
sxu
|
2608d6af78
|
Merge branch 'branch_syruan'
|
2024-10-23 17:57:30 +08:00 |
|
syruan
|
c36d13a60a
|
新购验收单接口、注解修改
|
2024-10-23 17:54:39 +08:00 |
|
mashuai
|
e4ff53d048
|
配置类定义
|
2024-10-23 17:49:11 +08:00 |
|
mashuai
|
bd92d12d5c
|
配置类定义
|
2024-10-23 17:04:30 +08:00 |
|
mashuai
|
b880112b5f
|
Merge branch 'master' into branch_basic
|
2024-10-23 16:55:08 +08:00 |
|
mashuai
|
8f4bb21f93
|
配置类定义
|
2024-10-23 16:54:58 +08:00 |
|
mashuai
|
4118e5080b
|
配置类定义
|
2024-10-23 16:53:21 +08:00 |
|
mashuai
|
cc0f05de55
|
新购绑定
|
2024-10-23 16:50:16 +08:00 |
|
mashuai
|
0b5f0bea3f
|
新购绑定
|
2024-10-23 16:32:02 +08:00 |
|
mashuai
|
be0d514e89
|
新购绑定
|
2024-10-23 15:11:04 +08:00 |
|
mashuai
|
831fb82863
|
新购绑定
|
2024-10-23 14:57:50 +08:00 |
|
mashuai
|
b85fd88d32
|
新购绑定
|
2024-10-23 14:45:52 +08:00 |
|
mashuai
|
ea70eca3a4
|
新购绑定
|
2024-10-23 14:24:44 +08:00 |
|
mashuai
|
57c582533e
|
新购绑定
|
2024-10-23 14:19:06 +08:00 |
|
syruan
|
4cf98d9249
|
更新附件上传、查看的接口
|
2024-10-23 14:05:56 +08:00 |
|
mashuai
|
2c3ee99151
|
Merge branch 'master' into branch_basic
|
2024-10-23 13:59:53 +08:00 |
|
mashuai
|
e177458116
|
新购绑定
|
2024-10-23 13:50:04 +08:00 |
|
syruan
|
55aad85480
|
任务状态枚举更新、新购验收接口、事务处理
|
2024-10-23 13:46:01 +08:00 |
|
mashuai
|
315cce8cdc
|
新购绑定
|
2024-10-23 11:17:47 +08:00 |
|
mashuai
|
0013ceeed0
|
新购绑定
|
2024-10-23 11:12:46 +08:00 |
|
sxu
|
015f993bfe
|
Merge remote-tracking branch 'origin/branch_basic'
|
2024-10-23 10:20:34 +08:00 |
|
mashuai
|
30364e6b19
|
新购绑定
|
2024-10-23 10:05:59 +08:00 |
|
mashuai
|
cef5310e65
|
新购绑定
|
2024-10-23 09:48:47 +08:00 |
|
mashuai
|
de3594b947
|
新购绑定
|
2024-10-22 16:32:55 +08:00 |
|
mashuai
|
ef3e01353c
|
新购绑定
|
2024-10-22 15:38:00 +08:00 |
|
mashuai
|
83cc6bd022
|
新购绑定
|
2024-10-22 14:22:34 +08:00 |
|
mashuai
|
1c70d63c42
|
新购绑定
|
2024-10-22 14:16:53 +08:00 |
|
syruan
|
d23f2765ae
|
新购验收--定义枚举、增加事务、去除TODO
|
2024-10-22 14:02:26 +08:00 |
|
mashuai
|
2bed78391e
|
新购绑定
|
2024-10-22 14:00:51 +08:00 |
|
sxu
|
7067ff7290
|
替代MaTypeConfigController
|
2024-10-22 13:27:25 +08:00 |
|
syruan
|
f1a955262a
|
新购验收--报告附件查询、报告附件新增API
|
2024-10-22 11:27:34 +08:00 |
|
mashuai
|
246b482bc2
|
新购入库
|
2024-10-21 18:40:35 +08:00 |
|
syruan
|
56f09fd5c7
|
新增新购模块枚举
|
2024-10-21 16:52:34 +08:00 |
|
syruan
|
e48ddb3d85
|
物资类型API--优化业务代码至service层
|
2024-10-21 15:37:44 +08:00 |
|
syruan
|
ed83f77055
|
新购任务--批量发送短信sendSMS
|
2024-10-21 14:50:13 +08:00 |
|
syruan
|
c1abbcbba5
|
Merge remote-tracking branch 'origin/branch_syruan' into branch_syruan
|
2024-10-21 14:27:38 +08:00 |
|
syruan
|
8093deda18
|
新购任务--批量增加人员通知API
|
2024-10-21 14:27:17 +08:00 |
|
sxu
|
03a47de19f
|
Merge branch 'master' into branch_syruan
|
2024-10-21 14:14:08 +08:00 |
|
sxu
|
b9291f2106
|
Merge remote-tracking branch 'origin/branch_syruan' into branch_syruan
|
2024-10-21 14:12:04 +08:00 |
|
syruan
|
a542efc44d
|
物资类型--公用规格型号连动式下拉框
|
2024-10-21 13:20:13 +08:00 |
|
sxu
|
014996b1fe
|
Merge remote-tracking branch 'origin/master'
|
2024-10-21 10:17:30 +08:00 |
|
mashuai
|
93ab8b705f
|
合并提交
|
2024-10-21 09:54:57 +08:00 |
|
mashuai
|
1d47b4aea4
|
解决合并冲突
|
2024-10-21 09:53:19 +08:00 |
|
sxu
|
40f90333b9
|
替代MaTypeConfigController
|
2024-10-21 09:42:17 +08:00 |
|
mashuai
|
55acf99070
|
字段长度判断
|
2024-10-21 09:39:14 +08:00 |
|
mashuai
|
79f6a099a6
|
字段非空判断
|
2024-10-21 09:20:36 +08:00 |
|
syruan
|
6753565194
|
Merge remote-tracking branch 'origin/branch_syruan'
|
2024-10-18 18:24:31 +08:00 |
|
syruan
|
65fff1eefb
|
物资新购新增多表查询
|
2024-10-18 18:05:29 +08:00 |
|
sxu
|
31c7da6798
|
添加退料审核配置和读取
|
2024-10-18 17:41:51 +08:00 |
|
mashuai
|
413ba05302
|
工程管理
|
2024-10-18 17:36:17 +08:00 |
|
syruan
|
ed2290bc99
|
物资类型--控制器代码抽出 优化三四级节点关联逻辑
|
2024-10-18 16:57:12 +08:00 |
|
syruan
|
77e19d4d9d
|
物资类型新增字段
|
2024-10-18 15:29:49 +08:00 |
|
mashuai
|
c6aa29b09f
|
基础模块合并
|
2024-10-18 15:20:00 +08:00 |
|
mashuai
|
ab7aef3c84
|
Merge branch 'master' into branch_basic
|
2024-10-18 15:17:36 +08:00 |
|
mashuai
|
25481aa6af
|
工程管理
|
2024-10-18 15:13:39 +08:00 |
|
mashuai
|
8f87295d6a
|
工程管理
|
2024-10-18 15:01:36 +08:00 |
|
mashuai
|
935f8d5823
|
合并代码
|
2024-10-18 14:29:39 +08:00 |
|
syruan
|
bb4d2ebf80
|
供应商新增营业执照附件上传，新购流程开发
|
2024-10-18 13:54:24 +08:00 |
|
mashuai
|
c8cd712ed1
|
合并代码
|
2024-10-18 13:52:09 +08:00 |
|
mashuai
|
008a477ea6
|
设备管理
|
2024-10-18 13:36:56 +08:00 |
|
mashuai
|
548577d50b
|
设备管理
|
2024-10-18 13:26:45 +08:00 |
|
sxu
|
f779b8b0fe
|
添加任务审核模型
|
2024-10-18 12:07:48 +08:00 |
|
mashuai
|
f8bea11e1c
|
设备管理
|
2024-10-18 09:31:11 +08:00 |
|
mashuai
|
4f04b702ea
|
设备管理
|
2024-10-17 17:52:55 +08:00 |
|
mashuai
|
e6117efa28
|
设备管理
|
2024-10-17 17:51:42 +08:00 |
|
mashuai
|
de226bf8da
|
设备管理
|
2024-10-17 17:37:59 +08:00 |
|
mashuai
|
39b8332243
|
.
|
2024-10-17 17:00:19 +08:00 |
|
mashuai
|
92279a4d1c
|
.
|
2024-10-17 16:36:18 +08:00 |
|
mashuai
|
e048b6eb8d
|
设备管理
|
2024-10-17 16:32:33 +08:00 |
|
mashuai
|
a7ce14cd5a
|
设备管理
|
2024-10-17 16:23:06 +08:00 |
|
mashuai
|
d7046c075e
|
设备管理
|
2024-10-17 16:05:21 +08:00 |
|
sxu
|
c16a47c957
|
添加维修班库管员删除接口
|
2024-10-17 15:26:31 +08:00 |
|
syruan
|
a5571a6468
|
物资配置管理--增加SQL查询字段
|
2024-10-17 13:31:12 +08:00 |
|
mashuai
|
61bf060826
|
Merge branch 'master' into branch_basic
|
2024-10-17 09:10:33 +08:00 |
|
syruan
|
2f7951adbc
|
Merge remote-tracking branch 'origin/master' into branch_syruan
|
2024-10-17 09:10:18 +08:00 |
|
syruan
|
8cd0754e0c
|
物资配置管理--增加SQL查询字段
|
2024-10-17 09:07:54 +08:00 |
|
sxu
|
50691a004d
|
重构task
|
2024-10-16 20:39:48 +08:00 |
|
sxu
|
efc967aa6f
|
重构settlement
|
2024-10-16 20:34:05 +08:00 |
|
sxu
|
c8dd5dc2d1
|
重构scrap
|
2024-10-16 20:31:56 +08:00 |
|
sxu
|
487aa7bf90
|
重构repair
|
2024-10-16 20:30:17 +08:00 |
|
sxu
|
29f45b675e
|
重构push
|
2024-10-16 20:28:09 +08:00 |
|
sxu
|
f7a5815805
|
重构purchase
|
2024-10-16 20:26:27 +08:00 |
|
sxu
|
d3e4c102e4
|
重构plan
|
2024-10-16 20:24:19 +08:00 |
|
sxu
|
f43604d86a
|
重构iot
|
2024-10-16 20:22:19 +08:00 |
|
sxu
|
2db458e227
|
重构input
|
2024-10-16 20:20:26 +08:00 |
|
sxu
|
a7eb631c35
|
重构back
|
2024-10-16 20:16:16 +08:00 |
|
sxu
|
d27b42b85c
|
重构lease
|
2024-10-16 20:12:12 +08:00 |
|
syruan
|
99c76a7b7d
|
物资配置管理--增加序列化注解
|
2024-10-16 20:06:38 +08:00 |
|
syruan
|
ab23106e1a
|
物资配置管理--维修库表查询SQL
|
2024-10-16 20:04:29 +08:00 |
|
syruan
|
0d779b47e6
|
物资配置管理--优化循环逻辑
|
2024-10-16 19:57:57 +08:00 |
|
syruan
|
cdcba68d85
|
物资配置管理--业务逻辑抽离，遍历修改
|
2024-10-16 19:17:53 +08:00 |
|
sxu
|
6623d7e57f
|
仓库重名报错
|
2024-10-16 18:59:09 +08:00 |
|
sxu
|
18013a2e0f
|
仓库重名报错
|
2024-10-16 18:56:51 +08:00 |
|
syruan
|
16e4db25c9
|
物资配置管理--库管员、维修员的绑定及解绑
|
2024-10-16 18:45:27 +08:00 |
|
mashuai
|
7376ca7421
|
配件管理
|
2024-10-16 17:56:01 +08:00 |
|
syruan
|
d8f69259ec
|
物资配置管理--优化三四级节点内循环逻辑
|
2024-10-16 16:12:03 +08:00 |
|
mashuai
|
20db0026a7
|
合并代码
|
2024-10-16 15:59:24 +08:00 |
|
syruan
|
e33c93d51e
|
物资配置管理--右侧物资配置列表
|
2024-10-16 15:58:45 +08:00 |
|
mashuai
|
cc556043f3
|
合并代码
|
2024-10-16 15:47:58 +08:00 |
|
mashuai
|
e2e7dbd72d
|
配件类型管理
|
2024-10-16 15:25:05 +08:00 |
|
sxu
|
bf79dbb4df
|
24.10.0-SNAPSHOT
|
2024-10-16 15:13:48 +08:00 |
|
syruan
|
3d26950c99
|
物资配置管理--新建vo及组织人员树API
|
2024-10-16 14:14:28 +08:00 |
|
mashuai
|
39ee20b818
|
工程管理
|
2024-10-16 11:10:01 +08:00 |
|
mashuai
|
a086a8093a
|
Merge remote-tracking branch 'origin/branch_basic' into branch_basic
|
2024-10-16 10:57:31 +08:00 |
|
mashuai
|
c73c988bdb
|
工程管理
|
2024-10-16 10:57:22 +08:00 |
|
sxu
|
bb400b2bcf
|
更新bmstoragelog字段名称
|
2024-10-16 10:23:38 +08:00 |
|
syruan
|
9eeb4b4940
|
物资仓库删除条件,冗余内容删除
|
2024-10-16 10:00:55 +08:00 |
|
mashuai
|
565b7097e5
|
工程管理
|
2024-10-16 09:47:05 +08:00 |
|
syruan
|
a88a02926b
|
物资厂家管理--注释调整
|
2024-10-16 09:16:15 +08:00 |
|
syruan
|
6cdf19cca3
|
物资厂家管理API
|
2024-10-15 18:49:19 +08:00 |
|
syruan
|
e85219e6f5
|
物资类型管理--对4级层级节点进行数据处理
|
2024-10-15 18:13:34 +08:00 |
|
mashuai
|
6f0ee62c9f
|
工程管理
|
2024-10-15 18:12:06 +08:00 |
|
mashuai
|
4ad579e2ac
|
工程管理及三方推送
|
2024-10-15 16:41:14 +08:00 |
|
syruan
|
398c450268
|
物资类型管理--新增父级查询子级tree树形下拉框API
|
2024-10-15 16:23:06 +08:00 |
|
syruan
|
0d3f737406
|
物资类型管理--新增物资仓库查询树状API
|
2024-10-15 16:12:37 +08:00 |
|
syruan
|
0b694fe72a
|
物资类型管理--树形新增0级仓库配置
|
2024-10-15 15:28:02 +08:00 |
|
syruan
|
a11b03b12e
|
物资类型管理--修改mapper
|
2024-10-15 14:26:54 +08:00 |
|
syruan
|
bd1716a2d3
|
物资仓库下拉列表,DataCode枚举
|
2024-10-15 13:26:33 +08:00 |
|
mashuai
|
36f10b16b3
|
资产属性管理
|
2024-10-15 13:25:33 +08:00 |
|
mashuai
|
ecddcb5307
|
单位管理
|
2024-10-15 11:00:46 +08:00 |
|
mashuai
|
344a4b6694
|
单位类型人员绑定
|
2024-10-15 10:55:49 +08:00 |
|
mashuai
|
df6f043c59
|
单位类型人员绑定
|
2024-10-15 10:21:17 +08:00 |
|
syruan
|
5e999139a9
|
物资类型管理--新增列表父级查询
|
2024-10-14 18:34:30 +08:00 |
|
syruan
|
09c8b9f101
|
物资类型管理--优化递归逻辑,新增vo
|
2024-10-14 18:07:00 +08:00 |
|
syruan
|
40cb13324d
|
物资类型管理--修改查询
|
2024-10-14 17:20:44 +08:00 |
|
mashuai
|
844ab1067d
|
单位类型
|
2024-10-14 17:11:46 +08:00 |
|
syruan
|
e5703fa5fc
|
物资类型管理--新增tree树形下拉框
|
2024-10-14 16:27:16 +08:00 |
|
mashuai
|
7d0a54fe83
|
单位类型
|
2024-10-14 16:25:57 +08:00 |
|
mashuai
|
36ea481926
|
单位类型
|
2024-10-14 16:16:22 +08:00 |
|
syruan
|
38ad174175
|
物资类型管理--逻辑删除、过滤
|
2024-10-14 15:03:00 +08:00 |
|
mashuai
|
9ddaa2d7b8
|
工程和单位接口
|
2024-10-14 13:52:48 +08:00 |
|
sxu
|
cd3e33df29
|
bootstrap-sgzb_bns_test.yml
|
2024-10-12 17:22:32 +08:00 |
|
sxu
|
296bf92f1e
|
bonus.version=24.9.0
|
2024-10-12 14:39:35 +08:00 |
|
sxu
|
ef460cfc15
|
selectBmConfigByItemName
|
2024-10-12 11:27:01 +08:00 |
|
sxu
|
16c396b577
|
站点配置参数获取的方法化
|
2024-09-30 17:58:59 +08:00 |
|
sxu
|
00103789d7
|
完成代码生成
|
2024-09-27 15:48:39 +08:00 |
|
sxu
|
0f218729db
|
PreventRepeatSubmit
|
2024-09-27 15:44:11 +08:00 |
|
sxu
|
fb6bf45866
|
PreventRepeatSubmit
|
2024-09-27 15:38:58 +08:00 |
|
sxu
|
4527ac41e8
|
PreventRepeatSubmit
|
2024-09-27 15:36:56 +08:00 |
|
sxu
|
b0ff66ed68
|
PreventRepeatSubmit
|
2024-09-27 15:31:39 +08:00 |
|
sxu
|
1533f3b747
|
PreventRepeatSubmit
|
2024-09-27 15:26:57 +08:00 |
|
sxu
|
00aec33c72
|
PreventRepeatSubmit
|
2024-09-27 15:14:14 +08:00 |
|
sxu
|
9a723b103b
|
PreventRepeatSubmit
|
2024-09-27 15:07:13 +08:00 |
|
sxu
|
e834d015d9
|
PreventRepeatSubmit
|
2024-09-27 14:57:55 +08:00 |
|
sxu
|
0969b4d3cf
|
PreventRepeatSubmit
|
2024-09-27 13:08:24 +08:00 |
|
sxu
|
cead6aca6e
|
PreventRepeatSubmit
|
2024-09-27 12:59:44 +08:00 |
|
sxu
|
59aa76d0c4
|
back
|
2024-09-26 17:28:00 +08:00 |
|
sxu
|
cf85f9dd86
|
input
|
2024-09-26 17:18:07 +08:00 |
|
sxu
|
9b8060bb61
|
input
|
2024-09-26 16:46:13 +08:00 |
|
sxu
|
6c4b379203
|
screen
|
2024-09-26 16:22:00 +08:00 |
|
sxu
|
48a4ab38ab
|
basic
|
2024-09-26 16:15:51 +08:00 |
|
sxu
|
a0d24b6e04
|
material screen
|
2024-09-26 10:03:58 +08:00 |
|
sxu
|
b9b25acad6
|
material screen
|
2024-09-26 09:45:17 +08:00 |
|
sxu
|
574142b4cc
|
material screen
|
2024-09-26 09:33:49 +08:00 |
|
sxu
|
36c9926067
|
material screen
|
2024-09-26 09:31:20 +08:00 |
|
sxu
|
28f2d277db
|
material screen
|
2024-09-26 09:23:30 +08:00 |
|
sxu
|
261140bf35
|
material screen
|
2024-09-26 09:20:43 +08:00 |
|
sxu
|
b5b1396fd5
|
material screen
|
2024-09-26 09:19:02 +08:00 |
|
sxu
|
03a878464e
|
add bigscreen
|
2024-09-25 16:35:38 +08:00 |
|
sxu
|
d21dcb4579
|
scripts
|
2024-09-25 16:11:55 +08:00 |
|
sxu
|
b5af9513da
|
scripts
|
2024-09-25 16:08:03 +08:00 |
|
sxu
|
dfdb9404d4
|
first commit
|
2024-09-25 15:06:07 +08:00 |