 mashuai
|
f072ab95b8
|
退料审核bug
|
2024-06-19 11:34:47 +08:00 |
|
mashuai
|
4a8042b267
|
退料审核bug
|
2024-06-18 16:14:53 +08:00 |
 15856
|
2aed98e19c
|
首页展示问题优化
|
2024-06-18 15:21:55 +08:00 |
|
mashuai
|
7be2995a04
|
退料审核bug
|
2024-06-18 14:07:30 +08:00 |
|
mashuai
|
4a0741161e
|
退料审核bug
|
2024-06-18 13:44:23 +08:00 |
|
15856
|
5da3ca0b18
|
文件上传修改
|
2024-06-17 17:12:22 +08:00 |
 csyue
|
da207e3298
|
宁夏测试问题修改
|
2024-06-17 14:43:54 +08:00 |
|
mashuai
|
2534328388
|
领料bug
|
2024-06-17 13:37:06 +08:00 |
|
15856
|
21b5304490
|
领料催办任务
|
2024-06-14 17:33:27 +08:00 |
|
15856
|
fe70c92210
|
在任务表中对领料和退料创建人进行统一存userId，对以前的逻辑进行修改
|
2024-06-14 13:48:18 +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 |
|
15856
|
0190782966
|
报废原因和报废图片回显问题
|
2024-06-13 11:29:09 +08:00 |
|
mashuai
|
4b35f59c57
|
入库盘点
|
2024-06-12 18:13:25 +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 |
|
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
|
8c3665d599
|
试运行问题修改
|
2024-06-05 17:48:30 +08:00 |
|
csyue
|
2a0556f200
|
试运行问题修改
|
2024-06-05 15:44:39 +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 |
|
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 |
|
hayu
|
f4d2a37cfe
|
新购流程修改
|
2024-05-31 13:09:02 +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 |
|
mashuai
|
6b89c6f089
|
盘点入库详情
|
2024-05-28 17:08:12 +08:00 |
|
mashuai
|
3ebb67dd24
|
bug
|
2024-05-27 17:40:18 +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
|
876e346a7e
|
报废导出和查询bug代码提交
|
2024-05-16 17:59:05 +08:00 |
|
mashuai
|
8f71e98681
|
bug
|
2024-05-15 15:58:46 +08:00 |
|
liang.chao
|
ec1c6141b1
|
退料审核代码提交
|
2024-05-15 13:22:40 +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 |
|
liang.chao
|
86dc06dd54
|
代码codeview
|
2024-05-10 17:05:24 +08:00 |
|
liang.chao
|
2c14888e0d
|
领料申请代码codeview
|
2024-05-10 15:22:15 +08:00 |
|
mashuai
|
99761fb49c
|
权限
|
2024-05-08 18:23:47 +08:00 |
BianLzhaoMin
|
f6c1bdb1c7
|
冲突合并
|
2024-05-07 16:38:53 +08:00 |
|
15856
|
d92af0df79
|
导出预报废审核列表
|
2024-05-07 11:02:36 +08:00 |
|
mashuai
|
0f3675df58
|
bug
|
2024-05-07 10:21:12 +08:00 |
|
15856
|
40736e1c85
|
催办，退料报废，维修报废，预报废审核，报废审核
|
2024-05-06 10:35:08 +08:00 |
|
liang.chao
|
bc8420e094
|
bug修改提交
|
2024-04-30 16:43:40 +08:00 |
|
15856
|
25f84100e6
|
bug修复
|
2024-04-30 14:32:17 +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 |
|
15856
|
bad5c11bdc
|
Merge remote-tracking branch 'origin/dev' into dev-cq-bug
|
2024-04-28 16:41:10 +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
|
14822542ce
|
Bug修复
|
2024-04-25 16:43:56 +08:00 |
|
mashuai
|
0e681358a9
|
bug
|
2024-04-25 15:52:01 +08:00 |
|
liang.chao
|
82e8a6db4a
|
退料审核代码提交
|
2024-04-24 14:05:18 +08:00 |
|
liang.chao
|
5490fd2e8f
|
成套抱杆机具验收
|
2024-04-23 17:36:00 +08:00 |
|
liang.chao
|
62f2330ffb
|
成套机具代码提交
|
2024-04-23 09:19:37 +08:00 |
|
csyue
|
f94470a742
|
测试app问题项修改
|
2024-04-22 18:58:46 +08:00 |
|
mashuai
|
f175c44ba1
|
整套抱杆
|
2024-04-22 11:28:36 +08:00 |
|
mashuai
|
a10c3dd8a7
|
bug
|
2024-04-22 10:20:29 +08:00 |
|
liang.chao
|
b1fee78651
|
bug修改
|
2024-04-20 17:29:05 +08:00 |
|
hayu
|
c180ad60e7
|
测试问题修改
|
2024-04-20 16:58:15 +08:00 |
|
mashuai
|
07c77c5ad3
|
bug
|
2024-04-20 16:01:30 +08:00 |
|
hayu
|
a7d8ad5ef8
|
修饰入库不通过问题修改
|
2024-04-20 14:55:38 +08:00 |
 sxu
|
ff93691d19
|
回滚错误提交
|
2024-04-20 14:29:59 +08:00 |
|
sxu
|
00a634cd0b
|
fix conflict
|
2024-04-20 14:21:17 +08:00 |
|
mashuai
|
264bd77a41
|
bug
|
2024-04-20 13:55:53 +08:00 |
|
hayu
|
720ac160e6
|
任务单号获取修改
|
2024-04-20 12:21:00 +08:00 |
|
hayu
|
54cef0f824
|
任务单号获取修改
|
2024-04-20 11:23:08 +08:00 |
|
liang.chao
|
6207d42ee5
|
重庆机具问题提交
|
2024-04-20 10:42:49 +08:00 |
syruan
|
4ba7fa1e04
|
物资LOG日志
|
2024-04-18 16:34:01 +08:00 |
|
mashuai
|
af01245488
|
入库盘点
|
2024-04-17 15:32:23 +08:00 |
|
mashuai
|
4b39107750
|
入库盘点
|
2024-04-17 15:07:29 +08:00 |
|
mashuai
|
4777c2fbb9
|
FIX
|
2024-04-17 10:47:29 +08:00 |
|
liang.chao
|
9a7e4f0dc2
|
领料管理页面展示bug
|
2024-04-17 10:26:01 +08:00 |
|
15856
|
3dcca77cf0
|
bug修复
|
2024-04-16 10:37:42 +08:00 |
|
liang.chao
|
09dd56414a
|
退料接收撤回代码提交
|
2024-04-15 16:03:44 +08:00 |
|
mashuai
|
ad46244534
|
FIX
|
2024-04-15 13:54:22 +08:00 |
|
15856
|
d771ed2975
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-15 09:43:03 +08:00 |
|
15856
|
ecb952183c
|
bug修复
|
2024-04-15 09:42:52 +08:00 |
|
hayu
|
273780187a
|
新购入库问题修改
|
2024-04-13 13:31:25 +08:00 |
|
mashuai
|
376020f506
|
计划借调管理初版
|
2024-04-12 18:02:20 +08:00 |
|
liang.chao
|
d5384b25b3
|
bug修改
|
2024-04-12 17:21:21 +08:00 |
|
liang.chao
|
1ecf314a2a
|
bug修改
|
2024-04-12 17:18:48 +08:00 |
|
syruan
|
77c740164c
|
物资LOG日志
|
2024-04-12 16:19:28 +08:00 |
|
mashuai
|
86bfcdae12
|
计划借调管理初版
|
2024-04-12 14:27:08 +08:00 |
|
hayu
|
6deb17db59
|
新购入库问题修改
|
2024-04-11 18:28:20 +08:00 |
|
liang.chao
|
2ee6e711c1
|
bug修改
|
2024-04-11 18:00:57 +08:00 |
|
mashuai
|
d98daff25c
|
fix:模糊查询，分页功能优化
|
2024-04-11 13:06:32 +08:00 |
|
liang.chao
|
93139ffd5a
|
bug及退料接收代码提交
|
2024-04-10 17:48:09 +08:00 |
|
mashuai
|
5c1bf635a8
|
fix
|
2024-04-10 16:08:19 +08:00 |
|
hayu
|
29df08846a
|
功能优化
|
2024-04-07 15:52:57 +08:00 |
|
mashuai
|
a815a24790
|
退料入库
|
2024-04-07 14:29:02 +08:00 |
|
syruan
|
1dbfb3f562
|
优化import引用，新增重庆领料确认接口
|
2024-04-07 13:44:14 +08:00 |
|
liang.chao
|
902c5015ac
|
bug提交
|
2024-04-03 17:20:33 +08:00 |
|
mashuai
|
1f8fd7b7e1
|
test
|
2024-04-03 15:26:11 +08:00 |
|
liang.chao
|
8592abb9b4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-03 14:08:29 +08:00 |
|
liang.chao
|
c96a108d89
|
退料申请表数据问题修改
|
2024-04-03 14:08:22 +08:00 |
|
hayu
|
dba22d1477
|
厂家规格型号添加及机具仓储状态查询修改
|
2024-04-03 14:07:26 +08:00 |
|
mashuai
|
a73dbcf24c
|
盘点入库youhua
|
2024-04-03 10:28:37 +08:00 |
|
hayu
|
91a60339bc
|
综合查询-维修查询
|
2024-04-02 17:52:06 +08:00 |
|
mashuai
|
fc6d449566
|
盘点入库youhua
|
2024-04-02 15:15:33 +08:00 |
|
hayu
|
e1e8a47e06
|
问题修复
|
2024-04-02 13:57:31 +08:00 |
|
mashuai
|
a053608b78
|
盘点入库-数量入库
|
2024-04-02 13:19:59 +08:00 |
|
liang.chao
|
85d6291312
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-29 17:48:07 +08:00 |
|
liang.chao
|
026598a082
|
领料出库代码提交
|
2024-03-29 17:48:02 +08:00 |
|
mashuai
|
db9e2eba2b
|
盘点入库
|
2024-03-29 17:41:31 +08:00 |
|
hayu
|
b42e9e9ab3
|
入库盘点
|
2024-03-28 09:29:57 +08:00 |
|
liang.chao
|
0f4ae97bad
|
退料出库代码提交
|
2024-03-27 18:15:32 +08:00 |
|
hayu
|
85cb92670f
|
二级库功能修复
|
2024-03-26 18:06:37 +08:00 |
|
liang.chao
|
696380cec6
|
bug修改
|
2024-03-26 17:31:06 +08:00 |
|
hayu
|
f64ebf1aea
|
功能修复
|
2024-03-25 18:20:42 +08:00 |
|
hayu
|
c96e26c635
|
功能修复
|
2024-03-22 18:00:57 +08:00 |
|
syruan
|
5a01e0bb4d
|
重庆机具退料新接口，优化代码结构
|
2024-03-22 15:23:57 +08:00 |
|
liang.chao
|
929673e491
|
退料申请表数据问题修改
|
2024-03-21 09:06:12 +08:00 |
|
liang.chao
|
463d5bee5a
|
退料申请表数据问题修改
|
2024-03-20 14:14:49 +08:00 |
|
liang.chao
|
fc17702ea5
|
机具编码入库逻辑修改
|
2024-03-20 14:10:41 +08:00 |
|
liang.chao
|
a7bf8ea2c1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-20 11:21:03 +08:00 |
|
liang.chao
|
bbc8d8b1d3
|
退料申请表数据问题修改
|
2024-03-20 11:20:50 +08:00 |
|
bns_han
|
a6830079e1
|
综合服务中心审核
|
2024-03-20 11:17:46 +08:00 |
|
liang.chao
|
4718646984
|
设备编码入库
|
2024-03-20 11:12:37 +08:00 |
|
liang.chao
|
a6336f96a9
|
工地直转审核
|
2024-03-20 10:07:54 +08:00 |
|
liang.chao
|
e6342021eb
|
退料申请表数据问题修改
|
2024-03-19 17:05:14 +08:00 |
|
liang.chao
|
270d3ae2f8
|
重庆领料申请代码提交
|
2024-03-16 15:33:49 +08:00 |
1539530615@qq.com
|
beb33397a8
|
问题修改
|
2024-03-15 18:00:23 +08:00 |
|
liang.chao
|
d2fe5b72f1
|
工地直转查询接口修改
|
2024-03-15 16:22:10 +08:00 |
|
liang.chao
|
0995bd6cb3
|
工地直转查询修改
|
2024-03-15 16:03:11 +08:00 |
|
liang.chao
|
39c42e931f
|
工地直转
|
2024-03-15 13:55:04 +08:00 |
|
liang.chao
|
6b7767fec0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-14 17:59:04 +08:00 |
|
liang.chao
|
c723a725b2
|
退料申请表数据问题修改
|
2024-03-14 17:58:50 +08:00 |
|
syruan
|
ca1980fdd6
|
优化导入，格式化时间，新增删除接口
|
2024-03-14 13:36:51 +08:00 |
|
liang.chao
|
e24109076c
|
工地直转
|
2024-03-14 09:51:15 +08:00 |
|
liang.chao
|
c5475985b9
|
退料申请表数据问题修改
|
2024-03-14 09:09:03 +08:00 |
|
liang.chao
|
a9627e18d2
|
退料申请表数据问题修改
|
2024-03-13 20:10:57 +08:00 |
|
liang.chao
|
de31f4e4f7
|
退料申请表数据问题修改
|
2024-03-13 18:16:50 +08:00 |
|
liang.chao
|
99ff64473d
|
退料申请表数据问题修改
|
2024-03-13 10:56:43 +08:00 |
|
liang.chao
|
85aecf7f66
|
退料申请表数据问题修改
|
2024-03-12 17:33:43 +08:00 |
|
liang.chao
|
b9edcaf673
|
退料申请表数据问题修改
|
2024-03-12 15:14:02 +08:00 |
|
liang.chao
|
d0d13039d6
|
工地直转
|
2024-03-12 13:52:31 +08:00 |