 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
|
48a4ab38ab
|
basic
|
2024-09-26 16:15:51 +08:00 |
|
sxu
|
a0d24b6e04
|
material screen
|
2024-09-26 10:03:58 +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 |