syruan
|
eab80f6156
|
SQL异常处理
|
2023-12-23 13:33:03 +08:00 |
 13218645326
|
d18dc7f9c4
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-23 13:27:12 +08:00 |
|
13218645326
|
cab2ceb199
|
退料申请
|
2023-12-23 13:27:04 +08:00 |
sliang
|
7e8e5b269b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 12:55:36 +08:00 |
 dingjie
|
d3f7052535
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 11:45:53 +08:00 |
|
dingjie
|
52a96de545
|
新购入库模块代码修改
|
2023-12-23 11:45:38 +08:00 |
|
sliang
|
18a5ba85e9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 11:03:21 +08:00 |
 bns_han
|
2265d0cebc
|
后台-退料申请与审核
|
2023-12-23 10:58:55 +08:00 |
|
sliang
|
d1fb47fa51
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 10:32:11 +08:00 |
|
dingjie
|
b23b0aa7eb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 10:31:53 +08:00 |
|
sliang
|
2629a01451
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 10:24:28 +08:00 |
|
bns_han
|
2380d97848
|
后台-退料申请与审核
|
2023-12-23 10:24:00 +08:00 |
|
dingjie
|
b721caef07
|
新购入库模块代码修改
|
2023-12-23 10:16:59 +08:00 |
|
sliang
|
bc7d1b914e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 21:23:42 +08:00 |
|
sliang
|
66aa9b717e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 21:23:32 +08:00 |
|
syruan
|
76cdd524f9
|
Merge remote-tracking branch 'devVPN/dev' into dev
|
2023-12-22 21:23:29 +08:00 |
|
syruan
|
86acb6308b
|
mapper修改
|
2023-12-22 21:23:00 +08:00 |
|
dingjie
|
35c6862e01
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 21:08:09 +08:00 |
|
dingjie
|
439536142a
|
新购入库模块代码修改
|
2023-12-22 21:07:56 +08:00 |
|
sliang
|
497a00493b
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
|
2023-12-22 20:42:29 +08:00 |
|
syruan
|
7f73c243f5
|
支持工程与往来单位及协议修改
|
2023-12-22 20:27:35 +08:00 |
|
sliang
|
621fe5a27a
|
获取领料申请-详情列表
|
2023-12-22 20:17:22 +08:00 |
zhouzy062
|
1666636cab
|
新购编码管理修改
|
2023-12-22 19:16:39 +08:00 |
|
dingjie
|
a18aff4d23
|
新购模块代码修改
|
2023-12-22 19:14:59 +08:00 |
|
zhouzy062
|
2700fceceb
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-22 18:58:23 +08:00 |
|
zhouzy062
|
294fbc4d3e
|
新购编码修改
|
2023-12-22 18:57:52 +08:00 |
 gmhao
|
689abd905d
|
设备标签二改 新增下拉框
|
2023-12-22 18:49:20 +08:00 |
zhouxain01
|
69496ef5fb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 18:26:55 +08:00 |
|
zhouxain01
|
5adcc35655
|
修改标签绑定按钮判断
|
2023-12-22 18:26:50 +08:00 |
 liuchuan
|
0abdca2751
|
后台代码提交
|
2023-12-22 17:59:58 +08:00 |
|
zhouxain01
|
1a7fac7cb9
|
修改标签绑定代码提交
|
2023-12-22 17:29:57 +08:00 |
|
zhouxain01
|
aa2a2a7ab0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 17:14:02 +08:00 |
|
zhouxain01
|
5ead43e5df
|
修改基础管理代码提交
|
2023-12-22 17:13:57 +08:00 |
|
gmhao
|
2495ce88f5
|
设备标签二改 新增下拉框
|
2023-12-22 17:07:32 +08:00 |
|
syruan
|
04d79ac8b0
|
完善领料申请修改逻辑
|
2023-12-22 16:24:25 +08:00 |
 cwchen
|
d51ec0bbf3
|
统一下拉选-设备树添加company_id
|
2023-12-22 16:17:57 +08:00 |
|
bns_han
|
0172196653
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 15:58:14 +08:00 |
|
bns_han
|
b71ca1e957
|
后台-退料申请与审核
|
2023-12-22 15:57:59 +08:00 |
wlikett
|
7898ac0abd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 15:57:36 +08:00 |
|
wlikett
|
7bcd950052
|
设备级联搜索处理
|
2023-12-22 15:57:21 +08:00 |
|
bns_han
|
5275483a0e
|
后台-退料申请与审核
|
2023-12-22 15:57:10 +08:00 |
|
13218645326
|
2a4b8420f6
|
退料
|
2023-12-22 15:55:19 +08:00 |
|
wlikett
|
9d8bd6d94b
|
领料任务详情接口对接 对接
|
2023-12-22 15:33:24 +08:00 |
|
syruan
|
9fa297de47
|
合并分支，解决异常冲突
|
2023-12-22 15:23:07 +08:00 |
|
syruan
|
3e1839ce64
|
合并分支，处理冲突异常
|
2023-12-22 15:21:18 +08:00 |
|
syruan
|
bf0c462853
|
删除领料明细接口提交
|
2023-12-22 15:10:27 +08:00 |
|
sliang
|
6d642b7edf
|
获取领料申请-详情列表
|
2023-12-22 14:48:58 +08:00 |
|
bns_han
|
7f1e051e42
|
后台-退料申请与审核
|
2023-12-22 14:13:53 +08:00 |
|
zhouxain01
|
0ec118efb4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 14:06:04 +08:00 |
|
zhouxain01
|
8aa87bdec8
|
修改标签相关代码
|
2023-12-22 14:05:57 +08:00 |