 15856
|
fe70c92210
|
在任务表中对领料和退料创建人进行统一存userId，对以前的逻辑进行修改
|
2024-06-14 13:48:18 +08:00 |
 hayu
|
deb1d7ad61
|
新购新增类型下拉框去重
|
2024-06-14 13:37:26 +08:00 |
|
hayu
|
960aa87399
|
新购状态
|
2024-06-14 11:30:10 +08:00 |
|
15856
|
bb2469f184
|
报废原因和报废图片回显问题
|
2024-06-14 09:18:06 +08:00 |
BianLzhaoMin
|
e4e4ce6dea
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-06-13 14:58:01 +08:00 |
|
BianLzhaoMin
|
8fffbb4c67
|
增加领料时设备类型选择 并过滤出指定类型机具
|
2024-06-13 14:57:57 +08:00 |
 mashuai
|
8292dacb38
|
乱码bug
|
2024-06-13 14:55:58 +08:00 |
|
mashuai
|
7e3675a42a
|
乱码bug
|
2024-06-13 14:39:50 +08:00 |
|
BianLzhaoMin
|
e915c7a40b
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-06-13 14:09:02 +08:00 |
|
BianLzhaoMin
|
bd89662085
|
优化报废等页面数据回显，操作事件等
|
2024-06-13 14:08:59 +08:00 |
|
mashuai
|
ec9ce6cb7f
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-06-13 13:38:37 +08:00 |
|
mashuai
|
aa3e125e09
|
大屏页面优化
|
2024-06-13 13:38:26 +08:00 |
 binbin_pan
|
41cc383f04
|
大屏字段更改
|
2024-06-13 13:37:04 +08:00 |
|
BianLzhaoMin
|
b19296dbe4
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-06-13 13:07:18 +08:00 |
|
BianLzhaoMin
|
8bc40d2f07
|
优化新购配件保存后无法跳转问题，解决报废图片在预报废列表不回显等问题
|
2024-06-13 13:07:11 +08:00 |
|
15856
|
0190782966
|
报废原因和报废图片回显问题
|
2024-06-13 11:29:09 +08:00 |
|
hayu
|
ff06225e6e
|
代码异味
|
2024-06-13 09:43:16 +08:00 |
 bonus
|
bb5e3b844c
|
修改readme文件内容
|
2024-06-12 19:01:41 +08:00 |
|
binbin_pan
|
48dbc1cbab
|
fix: 2049-2050-2051-2057
|
2024-06-12 18:44:06 +08:00 |
|
mashuai
|
4b35f59c57
|
入库盘点
|
2024-06-12 18:13:25 +08:00 |
|
BianLzhaoMin
|
70861983a7
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-06-12 17:20:37 +08:00 |
|
BianLzhaoMin
|
00c0e75abf
|
优化领料申请页面问题
|
2024-06-12 17:20:34 +08:00 |
|
csyue
|
81b574141c
|
领料审核增加任务状态筛选
|
2024-06-12 16:56:36 +08:00 |
|
BianLzhaoMin
|
a9a42f4421
|
增加领料审核页面状态查询
|
2024-06-12 16:53:33 +08:00 |
|
binbin_pan
|
b5c59ac97a
|
领料管理-领料审核-查看详情任务状态
|
2024-06-12 16:22:40 +08:00 |
|
BianLzhaoMin
|
eaaa9cdafa
|
冲突合并
|
2024-06-12 16:17:19 +08:00 |
|
BianLzhaoMin
|
c4c2e6953d
|
优化页面样式，首页跳转bug等问题
|
2024-06-12 16:16:08 +08:00 |
|
binbin_pan
|
8edeace992
|
优化检验时间选择
|
2024-06-12 14:49:59 +08:00 |
|
binbin_pan
|
079b106148
|
fix: 协议管理，工程查询目前只能下拉选择，不能支持搜索选择
|
2024-06-12 13:49:22 +08:00 |
|
mashuai
|
078f3a6241
|
入库盘点
|
2024-06-12 13:40:05 +08:00 |
|
binbin_pan
|
6a21d5e7a3
|
优化
|
2024-06-12 13:25:33 +08:00 |
|
binbin_pan
|
940378a692
|
fix: 2036 检验时间可以晚于下次检验时间
|
2024-06-12 11:16:47 +08:00 |
|
binbin_pan
|
91c0464a0e
|
盘点入库-编码入库-设备编码必填
|
2024-06-12 10:35:55 +08:00 |
|
binbin_pan
|
b360d07dc4
|
fix: 2023 建议提示在输入框左侧显示
|
2024-06-12 09:44:34 +08:00 |
|
csyue
|
f4ac334d17
|
试运行问题修改
|
2024-06-11 09:38:16 +08:00 |
|
hayu
|
6e6694eb27
|
新购流程及综合查询修改
|
2024-06-07 17:12:11 +08:00 |
|
BianLzhaoMin
|
81b1458314
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-06-07 15:03:38 +08:00 |
|
BianLzhaoMin
|
1fcb130c64
|
优化页面样式
|
2024-06-07 15:03:35 +08:00 |
|
csyue
|
000000bc2f
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-06-07 14:55:19 +08:00 |
|
csyue
|
b35e883a53
|
1
|
2024-06-07 14:55:10 +08:00 |
|
BianLzhaoMin
|
70db7794fc
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-06-07 14:44:20 +08:00 |
|
BianLzhaoMin
|
18a57c30b5
|
新购增加提交审核按钮
|
2024-06-07 14:44:17 +08:00 |
|
hayu
|
d6577e9a6e
|
修改
|
2024-06-07 14:42:33 +08:00 |
|
BianLzhaoMin
|
f4d9a8a171
|
优化页面提示
|
2024-06-07 11:19:26 +08:00 |
|
hayu
|
803baa19f0
|
修改
|
2024-06-07 10:07:55 +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 |
|
BianLzhaoMin
|
e1928139b7
|
测试问题修改
|
2024-06-06 15:57:41 +08:00 |
|
BianLzhaoMin
|
9e113d0ee0
|
优化首页查看跳转，领料驳回等bug问题
|
2024-06-06 14:20:07 +08:00 |