liang.chao
|
48826ae819
|
禅道bug修改
|
2024-07-10 14:40:08 +08:00 |
mashuai
|
4e9dfa60cd
|
通知公告弹窗降序
|
2024-07-10 11:11:32 +08:00 |
mashuai
|
ff43266b93
|
通知公告弹窗微调
|
2024-07-10 10:59:10 +08:00 |
liang.chao
|
6ed34efbb8
|
禅道bug修改
|
2024-07-09 19:00:53 +08:00 |
liang.chao
|
6a2023bd4b
|
领料审核短信修改
|
2024-07-09 17:40:27 +08:00 |
mashuai
|
55bb72d1a1
|
通知公告弹窗
|
2024-07-09 13:09:27 +08:00 |
mashuai
|
feab351a4f
|
bug调试
|
2024-07-08 16:34:57 +08:00 |
15856
|
ff11afe15f
|
当一个订单多个机具归属一个库管员时,只要通知一次
|
2024-07-06 15:17:36 +08:00 |
liang.chao
|
ca683c727d
|
禅道bug修改提交
|
2024-07-05 18:12:13 +08:00 |
liang.chao
|
5b7f0128d4
|
禅道bug修改提交
|
2024-07-05 17:08:06 +08:00 |
liang.chao
|
249b1c1240
|
预报废退料审核提交和禅道bug修改提交
|
2024-07-05 16:55:48 +08:00 |
mashuai
|
52547c4323
|
test
|
2024-07-05 09:44:14 +08:00 |
mashuai
|
c1f55991eb
|
大屏页面调试
|
2024-07-04 09:26:02 +08:00 |
mashuai
|
9a942b3d87
|
大屏页面调试
|
2024-07-03 17:31:38 +08:00 |
mashuai
|
e2115c867f
|
领导发短信优先级未确认,暂时注释逐级发短信代码
|
2024-07-03 11:26:01 +08:00 |
15856
|
6001521609
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-07-03 09:55:34 +08:00 |
15856
|
e005116d3e
|
预报废驳回维修页面查看
|
2024-07-03 09:55:23 +08:00 |
liang.chao
|
c5a3725edf
|
退料单需求开发
|
2024-07-02 17:21:54 +08:00 |
liang.chao
|
1032f6d0a3
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-07-01 17:21:55 +08:00 |
liang.chao
|
9aaee8611c
|
试运行问题代码提交
|
2024-07-01 17:21:49 +08:00 |
mashuai
|
a1669a3e08
|
大屏二级页面分页
|
2024-07-01 15:36:33 +08:00 |
liang.chao
|
763746b314
|
试运行问题代码提交
|
2024-07-01 14:20:24 +08:00 |
15856
|
f28f3b6c86
|
预报废驳回退料页面优化
|
2024-06-28 16:35:10 +08:00 |
liang.chao
|
e852e14a31
|
问题代码提交
|
2024-06-28 09:55:41 +08:00 |
15856
|
bf812851cd
|
预报废驳回维修页面查看
|
2024-06-27 17:58:25 +08:00 |
15856
|
9fc5adaec3
|
预报废驳回维修页面查看
|
2024-06-27 16:48:41 +08:00 |
15856
|
2b201f35b5
|
预报废驳回和自动发送短信
|
2024-06-27 16:20:35 +08:00 |
15856
|
7810dd99ae
|
工机具类型管理绑定多个库管员时修改报错问题修复
|
2024-06-27 16:19:49 +08:00 |
mashuai
|
2e6db070e9
|
逐级短信审批催办
|
2024-06-27 11:07:42 +08:00 |
liang.chao
|
2b20d72d13
|
成套设备配置代码提交
|
2024-06-26 14:49:43 +08:00 |
liang.chao
|
c04a3b4738
|
维修员列表查询
|
2024-06-26 09:35:50 +08:00 |
liang.chao
|
8aa35d3ccf
|
测试问题提交
|
2024-06-25 17:46:52 +08:00 |
mashuai
|
f75f3107ea
|
测试修改
|
2024-06-25 10:37:41 +08:00 |
liang.chao
|
503d34ef03
|
测试问题提交
|
2024-06-25 10:33:24 +08:00 |
liang.chao
|
50de01d74d
|
测试问题提交
|
2024-06-25 10:21:46 +08:00 |
mashuai
|
2df173ba58
|
测试修改
|
2024-06-25 09:45:51 +08:00 |
liang.chao
|
904ac86d14
|
测试问题提交
|
2024-06-24 18:18:19 +08:00 |
mashuai
|
51b8a10208
|
数据返回结果
|
2024-06-24 18:07:22 +08:00 |
mashuai
|
bc3d9007fb
|
库管员bug
|
2024-06-24 17:47:36 +08:00 |
mashuai
|
bd706462e6
|
库管员bug
|
2024-06-24 17:43:21 +08:00 |
mashuai
|
88001ab860
|
库管员bug
|
2024-06-24 17:20:26 +08:00 |
liang.chao
|
55ef6f5b96
|
测试问题提交
|
2024-06-24 14:05:22 +08:00 |
mashuai
|
4924fbcaf8
|
编码设备分开展示
|
2024-06-24 10:27:23 +08:00 |
mashuai
|
ea64252ee1
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-06-24 10:13:12 +08:00 |
mashuai
|
cf317042c2
|
综合查询分开展示
|
2024-06-24 10:13:06 +08:00 |
liang.chao
|
5571b7d59b
|
同一设备两个库管员admin账号出库数量显示错误修改
|
2024-06-24 09:57:21 +08:00 |
liang.chao
|
7664de6244
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-06-21 17:11:38 +08:00 |
liang.chao
|
4667e836b8
|
成套机具修改
|
2024-06-21 17:07:53 +08:00 |
15856
|
356b68501c
|
工机具类型管理绑定多个库管员时修改报错问题修复
|
2024-06-21 17:03:38 +08:00 |
liang.chao
|
8beef5ff78
|
领料出库bug修改
|
2024-06-21 14:51:05 +08:00 |
liang.chao
|
1f800582da
|
测试提交记录
|
2024-06-21 10:04:52 +08:00 |
liangchao
|
d9420d3901
|
测试提交记录
|
2024-06-21 10:03:36 +08:00 |
liangchao
|
0f79d6becd
|
测试提交记录
|
2024-06-21 10:01:59 +08:00 |
csyue
|
ea9b885dbc
|
app增加报废任务列表
|
2024-06-21 09:57:33 +08:00 |
csyue
|
57daec7a73
|
app增加报废任务列表
|
2024-06-21 08:57:03 +08:00 |
hayu
|
78f99ec50d
|
新购测试问题修改
|
2024-06-20 14:04:13 +08:00 |
csyue
|
2030b0d41c
|
二维码查询退料
|
2024-06-19 13:51:32 +08:00 |
mashuai
|
f507727924
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-06-19 11:34:54 +08:00 |
mashuai
|
f072ab95b8
|
退料审核bug
|
2024-06-19 11:34:47 +08:00 |
15856
|
357f0350c6
|
内部审批以后短信通知管理人员进行出库
|
2024-06-19 09:52:03 +08:00 |
mashuai
|
4a8042b267
|
退料审核bug
|
2024-06-18 16:14:53 +08:00 |
15856
|
2aed98e19c
|
首页展示问题优化
|
2024-06-18 15:21:55 +08:00 |
15856
|
00b8031a96
|
退料接收新增报废图片和报废原因
|
2024-06-18 14:49:37 +08:00 |
mashuai
|
7be2995a04
|
退料审核bug
|
2024-06-18 14:07:30 +08:00 |
mashuai
|
4a0741161e
|
退料审核bug
|
2024-06-18 13:44:23 +08:00 |
csyue
|
292d9dc820
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-06-18 10:58:46 +08:00 |
csyue
|
d9e69d21b6
|
宁夏测试问题修改
|
2024-06-18 10:58:07 +08:00 |
15856
|
9803534ef5
|
优化创建人
|
2024-06-18 10:11:30 +08:00 |
15856
|
5da3ca0b18
|
文件上传修改
|
2024-06-17 17:12:22 +08:00 |
csyue
|
a43c4bf040
|
宁夏测试问题修改
|
2024-06-17 17:03:40 +08:00 |
csyue
|
113ed727af
|
宁夏测试问题修改
|
2024-06-17 16:30:46 +08:00 |
csyue
|
da207e3298
|
宁夏测试问题修改
|
2024-06-17 14:43:54 +08:00 |
15856
|
c1c4a6c72d
|
文件上传修改
|
2024-06-17 13:55:55 +08:00 |
mashuai
|
2534328388
|
领料bug
|
2024-06-17 13:37:06 +08:00 |
15856
|
21b5304490
|
领料催办任务
|
2024-06-14 17:33:27 +08:00 |
mashuai
|
8c78471e2f
|
验证码时效
|
2024-06-14 16:17:07 +08:00 |
15856
|
fe70c92210
|
在任务表中对领料和退料创建人进行统一存userId,对以前的逻辑进行修改
|
2024-06-14 13:48:18 +08:00 |
hayu
|
deb1d7ad61
|
新购新增类型下拉框去重
|
2024-06-14 13:37:26 +08:00 |
15856
|
bb2469f184
|
报废原因和报废图片回显问题
|
2024-06-14 09:18:06 +08:00 |
mashuai
|
8292dacb38
|
乱码bug
|
2024-06-13 14:55:58 +08:00 |
mashuai
|
7e3675a42a
|
乱码bug
|
2024-06-13 14:39:50 +08:00 |
mashuai
|
aa3e125e09
|
大屏页面优化
|
2024-06-13 13:38:26 +08:00 |
15856
|
0190782966
|
报废原因和报废图片回显问题
|
2024-06-13 11:29:09 +08:00 |
hayu
|
ff06225e6e
|
代码异味
|
2024-06-13 09:43:16 +08:00 |
mashuai
|
4b35f59c57
|
入库盘点
|
2024-06-12 18:13:25 +08:00 |
csyue
|
81b574141c
|
领料审核增加任务状态筛选
|
2024-06-12 16:56:36 +08:00 |
mashuai
|
078f3a6241
|
入库盘点
|
2024-06-12 13:40:05 +08:00 |
csyue
|
f4ac334d17
|
试运行问题修改
|
2024-06-11 09:38:16 +08:00 |
hayu
|
6e6694eb27
|
新购流程及综合查询修改
|
2024-06-07 17:12:11 +08:00 |
csyue
|
b35e883a53
|
1
|
2024-06-07 14:55:10 +08:00 |
hayu
|
d6577e9a6e
|
修改
|
2024-06-07 14:42:33 +08:00 |
hayu
|
75895eaa56
|
新购流程修改
|
2024-06-07 09:58:35 +08:00 |
hayu
|
c47cfa28d6
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
|
2024-06-07 09:53:59 +08:00 |
csyue
|
d74109015c
|
试运行问题修改
|
2024-06-06 17:59:23 +08:00 |
csyue
|
8c3665d599
|
试运行问题修改
|
2024-06-05 17:48:30 +08:00 |
csyue
|
2a0556f200
|
试运行问题修改
|
2024-06-05 15:44:39 +08:00 |
mashuai
|
cd66690bd5
|
重置,修改加解密
|
2024-06-05 14:56:09 +08:00 |
csyue
|
860987874e
|
宁夏试运行问题修改
|
2024-06-05 13:15:29 +08:00 |
hayu
|
facf7ffebc
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
# sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
|
2024-06-05 09:13:30 +08:00 |
csyue
|
8c120a3002
|
宁夏试运行问题修改
|
2024-06-04 18:10:42 +08:00 |
csyue
|
3be3330714
|
宁夏试运行问题修改
|
2024-06-04 13:04:54 +08:00 |
hayu
|
dd9d4d5c20
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
# sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
|
2024-06-04 09:12:04 +08:00 |
csyue
|
4201951630
|
宁夏试运行问题修改
|
2024-06-03 18:45:24 +08:00 |
csyue
|
403661be05
|
测试问题项修改
|
2024-05-31 23:38:35 +08:00 |
csyue
|
d1c8638876
|
测试问题项修改
|
2024-05-31 15:19:44 +08:00 |
csyue
|
16dc57e902
|
测试问题项修改
|
2024-05-31 15:04:51 +08:00 |
csyue
|
e547366f45
|
测试问题项修改
|
2024-05-31 14:48:04 +08:00 |
hayu
|
f4d2a37cfe
|
新购流程修改
|
2024-05-31 13:09:02 +08:00 |
csyue
|
b83a7dcf30
|
测试问题项修改
|
2024-05-30 17:55:01 +08:00 |
csyue
|
22b6be9f45
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-05-30 16:21:24 +08:00 |
csyue
|
e84f1c4b31
|
测试问题项修改
|
2024-05-30 16:20:20 +08:00 |
mashuai
|
7096390f0c
|
配置更改
|
2024-05-30 15:20:28 +08:00 |
csyue
|
f1584484ee
|
测试问题项修改
|
2024-05-30 13:57:07 +08:00 |
csyue
|
66fc5505eb
|
测试问题项修改
|
2024-05-30 09:52:38 +08:00 |
csyue
|
2ed82325b9
|
测试问题项修改
|
2024-05-29 19:34:25 +08:00 |
csyue
|
41813e09e9
|
测试问题项修改
|
2024-05-29 16:44:47 +08:00 |
mashuai
|
08c783d797
|
bug
|
2024-05-29 14:31:15 +08:00 |
csyue
|
564d5259f4
|
测试问题项修改
|
2024-05-29 13:13:45 +08:00 |
csyue
|
e314a4c4b1
|
测试问题项修改
|
2024-05-29 13:06:56 +08:00 |
csyue
|
5740d5841d
|
测试问题项修改
|
2024-05-29 12:47:49 +08:00 |
csyue
|
88dc90fa49
|
测试问题项修改
|
2024-05-29 12:44:54 +08:00 |
csyue
|
12a3cc8887
|
测试问题项修改
|
2024-05-29 11:52:59 +08:00 |
csyue
|
c2ea36160f
|
测试问题项修改
|
2024-05-29 11:24:18 +08:00 |
csyue
|
f0db05ce34
|
测试问题项修改
|
2024-05-29 11:02:12 +08:00 |
csyue
|
6cd6940519
|
测试问题项修改
|
2024-05-29 10:57:05 +08:00 |
csyue
|
587ffc6eab
|
测试问题项修改
|
2024-05-29 09:12:30 +08:00 |
csyue
|
84d718b9bc
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
|
2024-05-28 18:36:05 +08:00 |
csyue
|
9eda3aa948
|
测试问题项修改
|
2024-05-28 18:30:04 +08:00 |
mashuai
|
6b89c6f089
|
盘点入库详情
|
2024-05-28 17:08:12 +08:00 |
csyue
|
43e0624cda
|
测试问题项修改
|
2024-05-28 15:50:36 +08:00 |
csyue
|
0b37588854
|
测试问题项修改
|
2024-05-28 09:43:10 +08:00 |
csyue
|
02e4f72d97
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-05-28 09:38:41 +08:00 |
mashuai
|
a79ab95fe0
|
bug
|
2024-05-28 09:29:29 +08:00 |
csyue
|
f766d1ae97
|
测试问题项修改
|
2024-05-27 20:45:12 +08:00 |
mashuai
|
dd31e09009
|
手机号验证码次数限制
|
2024-05-27 18:42:32 +08:00 |
mashuai
|
3ebb67dd24
|
bug
|
2024-05-27 17:40:18 +08:00 |
mashuai
|
3e93e0ff4b
|
bug
|
2024-05-27 16:30:00 +08:00 |
mashuai
|
ba74371330
|
用户加解密
|
2024-05-25 16:35:50 +08:00 |
mashuai
|
c45eb9c65b
|
盘点入库
|
2024-05-25 16:03:46 +08:00 |
mashuai
|
f8dd3dfeba
|
bug
|
2024-05-24 14:55:07 +08:00 |
liang.chao
|
8c44207e86
|
代码提交
|
2024-05-17 14:04:40 +08:00 |
liang.chao
|
876e346a7e
|
报废导出和查询bug代码提交
|
2024-05-16 17:59:05 +08:00 |
liang.chao
|
ecc0dc1ecf
|
首页关键字查询
|
2024-05-16 10:59:01 +08:00 |
mashuai
|
8f71e98681
|
bug
|
2024-05-15 15:58:46 +08:00 |
liang.chao
|
db9afe3eaf
|
退料审核代码提交
|
2024-05-15 14:02:12 +08:00 |
liang.chao
|
ec1c6141b1
|
退料审核代码提交
|
2024-05-15 13:22:40 +08:00 |
liang.chao
|
aa1ced6f7c
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-05-15 10:30:05 +08:00 |
liang.chao
|
47628f51c1
|
领料通过代码优化
|
2024-05-15 10:29:51 +08:00 |
赵福海
|
c69007a1b9
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-05-15 10:13:41 +08:00 |
赵福海
|
5bc911baf8
|
待报废单号问题修复
|
2024-05-15 10:13:31 +08:00 |
mashuai
|
7426badbf3
|
bug-预报废审核列表
|
2024-05-15 09:15:42 +08:00 |
mashuai
|
2a8e060652
|
bug
|
2024-05-14 18:02:58 +08:00 |
liang.chao
|
c20ea17df3
|
宁夏流程及数据权限修改
|
2024-05-14 17:51:35 +08:00 |
liang.chao
|
95b87226fa
|
宁夏流程及数据权限修改
|
2024-05-14 16:44:16 +08:00 |
mashuai
|
602054580a
|
test
|
2024-05-13 09:27:11 +08:00 |
liang.chao
|
86dc06dd54
|
代码codeview
|
2024-05-10 17:05:24 +08:00 |
liang.chao
|
2c14888e0d
|
领料申请代码codeview
|
2024-05-10 15:22:15 +08:00 |
liang.chao
|
ecdacc0143
|
领料管理列表展示问题提交
|
2024-05-10 11:06:49 +08:00 |
liang.chao
|
54d057f5b2
|
领料申请删除bug修改
|
2024-05-10 09:59:04 +08:00 |
liang.chao
|
7ef53ff9fe
|
app退料接收无数据bug修改
|
2024-05-09 13:29:20 +08:00 |
mashuai
|
eda8eac15d
|
权限
|
2024-05-08 18:43:46 +08:00 |
mashuai
|
99761fb49c
|
权限
|
2024-05-08 18:23:47 +08:00 |
BianLzhaoMin
|
f6c1bdb1c7
|
冲突合并
|
2024-05-07 16:38:53 +08:00 |
liang.chao
|
8b5519223f
|
测试问题bug修改
|
2024-05-07 16:29:36 +08:00 |
15856
|
d92af0df79
|
导出预报废审核列表
|
2024-05-07 11:02:36 +08:00 |
mashuai
|
0f3675df58
|
bug
|
2024-05-07 10:21:12 +08:00 |
mashuai
|
75d2b02422
|
bug
|
2024-05-06 18:20:45 +08:00 |
liang.chao
|
25ad01ce71
|
bug修改提交
|
2024-05-06 17:59:30 +08:00 |
liang.chao
|
0cce5cc793
|
退料审核代码提交
|
2024-05-06 17:07:03 +08:00 |
15856
|
40736e1c85
|
催办,退料报废,维修报废,预报废审核,报废审核
|
2024-05-06 10:35:08 +08:00 |
mashuai
|
4c8a65cd54
|
大屏
|
2024-05-06 10:04:58 +08:00 |
BianLzhaoMin
|
688599a5b0
|
宁夏 冲突合并
|
2024-05-06 09:48:15 +08:00 |
liang.chao
|
52745e9a4e
|
退料审核代码提交
|
2024-05-06 09:42:49 +08:00 |
15856
|
834faeee43
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 17:51:44 +08:00 |
liang.chao
|
bc8420e094
|
bug修改提交
|
2024-04-30 16:43:40 +08:00 |
mashuai
|
1ed94a6706
|
bug
|
2024-04-30 15:14:27 +08:00 |
15856
|
9bc4bc2f6e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-30 14:32:33 +08:00 |
15856
|
25f84100e6
|
bug修复
|
2024-04-30 14:32:17 +08:00 |
liang.chao
|
1030c78305
|
app领料申请详情bug提交
|
2024-04-30 14:09:40 +08:00 |
15856
|
1419b8c32d
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 13:11:10 +08:00 |
mashuai
|
f23b73106a
|
bug
|
2024-04-30 11:29:00 +08:00 |
liang.chao
|
6b002958d6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-30 11:23:54 +08:00 |
liang.chao
|
ffe7c67c6f
|
重庆领料审核修改后无数据bug
|
2024-04-30 11:23:49 +08:00 |
15856
|
bbf5d988f3
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 10:26:55 +08:00 |
liang.chao
|
763c003c34
|
新购验收查询接口添加
|
2024-04-30 09:09:34 +08:00 |
mashuai
|
88ac035ed7
|
bug
|
2024-04-29 18:43:22 +08:00 |
mashuai
|
d1ed28a088
|
bug
|
2024-04-29 17:42:02 +08:00 |
mashuai
|
d58c1b788d
|
bug
|
2024-04-29 16:52:51 +08:00 |
syruan
|
7cef74aa24
|
物资LOG日志修订
|
2024-04-29 16:50:07 +08:00 |
mashuai
|
4f9cb5e37e
|
宁夏大屏二级页面
|
2024-04-29 14:38:15 +08:00 |
15856
|
bad5c11bdc
|
Merge remote-tracking branch 'origin/dev' into dev-cq-bug
|
2024-04-28 16:41:10 +08:00 |
15856
|
660d90550a
|
Bug修复
|
2024-04-28 16:23:43 +08:00 |
liang.chao
|
c2aaa44f1b
|
app联调代码提交
|
2024-04-28 16:16:29 +08:00 |
liang.chao
|
a8d0461e37
|
退料申请查询在用量代码提交
|
2024-04-28 09:13:18 +08:00 |
15856
|
f5f2307232
|
Bug修复
|
2024-04-26 17:58:14 +08:00 |
liang.chao
|
86c204a632
|
字段别名添加
|
2024-04-26 17:52:15 +08:00 |
liang.chao
|
bf0992137d
|
成套机具和退料申请当前在用量代码提交
|
2024-04-26 17:00:29 +08:00 |
15856
|
5051b6ae92
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-25 16:47:32 +08:00 |
15856
|
14822542ce
|
Bug修复
|
2024-04-25 16:43:56 +08:00 |
15856
|
090fc6c17d
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-25 16:42:58 +08:00 |