 liang.chao
|
4b1645e96e
|
Merge remote-tracking branch 'origin/master'
|
2024-09-23 16:35:39 +08:00 |
|
liang.chao
|
88f1e9f954
|
重庆需求变更代码提交
|
2024-09-23 16:35:29 +08:00 |
 wcy
|
322ae3d804
|
配件管理新增失败bug修改
|
2024-09-23 14:29:08 +08:00 |
|
wcy
|
e614875c3a
|
0923sql时间修改
|
2024-09-23 13:03:18 +08:00 |
|
liang.chao
|
15e9784617
|
字段类型提交
|
2024-09-19 16:03:06 +08:00 |
 sxu
|
f7bc5de8a2
|
fix conflict
|
2024-09-17 17:34:30 +08:00 |
|
liang.chao
|
1a18962c28
|
数量字段统一提交
|
2024-09-13 17:20:46 +08:00 |
|
liang.chao
|
171bf24536
|
Merge remote-tracking branch 'origin/master'
|
2024-09-12 11:29:54 +08:00 |
 15856
|
816c00dabd
|
配置修改
|
2024-09-12 11:28:22 +08:00 |
|
liang.chao
|
6f0d216a6e
|
生产bug和配置管理代码提交
|
2024-09-12 11:14:43 +08:00 |
|
sxu
|
1b8c7b0aa2
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/cqdevicemgt
|
2024-09-10 17:12:08 +08:00 |
|
sxu
|
3efffcc71a
|
use config
|
2024-09-10 17:09:48 +08:00 |
|
wcy
|
6436cc92fb
|
intelligentCode修改
|
2024-09-10 15:32:17 +08:00 |
|
wcy
|
b60edf406d
|
Merge remote-tracking branch 'origin/master'
|
2024-09-10 14:45:42 +08:00 |
|
wcy
|
1aa233edc0
|
intelligentCode修改
|
2024-09-10 14:45:21 +08:00 |
|
15856
|
88722578f8
|
配置修改
|
2024-09-10 13:24:28 +08:00 |
|
wcy
|
c2335ccf6f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
|
2024-09-10 11:13:36 +08:00 |
|
wcy
|
5fe548e1c8
|
machineCode新增
|
2024-09-10 11:12:02 +08:00 |
|
15856
|
821254a944
|
推送智慧工程代码完善
|
2024-09-10 10:17:35 +08:00 |
 mashuai
|
261980fc01
|
datetime
|
2024-09-10 09:19:01 +08:00 |
|
mashuai
|
5d783decb2
|
datetime
|
2024-09-09 10:11:47 +08:00 |
|
sxu
|
352291ba23
|
退料接收多类型机具时的问题优化
|
2024-09-08 13:27:36 +08:00 |
|
sxu
|
672ade2283
|
Merge branch 'master' into datetime0902
|
2024-09-07 09:16:42 +08:00 |
|
sxu
|
99fc70cf0c
|
Merge branch 'master' into typechange0901
|
2024-09-07 09:15:48 +08:00 |
|
liang.chao
|
a917964c96
|
代码中金额、数量类型修改
|
2024-09-06 17:31:54 +08:00 |
|
liang.chao
|
9c39f36d8e
|
代码中金额、数量类型修改
|
2024-09-06 13:46:06 +08:00 |
|
15856
|
ad6c3e64ea
|
接收从租赁推送过来的装备
|
2024-09-06 11:34:46 +08:00 |
|
mashuai
|
11eca5c209
|
datetime
|
2024-09-06 10:34:28 +08:00 |
|
liang.chao
|
5639054cfd
|
代码中金额、数量类型修改
|
2024-09-06 10:12:50 +08:00 |
|
liang.chao
|
d6888f6a97
|
代码中金额、数量类型修改
|
2024-09-05 18:22:29 +08:00 |
|
liang.chao
|
be630dae22
|
代码中金额、数量类型修改
|
2024-09-05 17:30:31 +08:00 |
|
15856
|
9af5335a71
|
获取管理员
|
2024-09-05 16:24:36 +08:00 |
|
sxu
|
e64ea2f2ca
|
推送业务
|
2024-09-04 17:25:57 +08:00 |
|
15856
|
495a07edde
|
获取管理员
|
2024-09-04 09:39:38 +08:00 |
|
sxu
|
112265865b
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/cqdevicemgt
|
2024-09-04 09:34:32 +08:00 |
|
15856
|
245306c2e1
|
http请求优化
|
2024-09-04 09:20:41 +08:00 |
|
mashuai
|
9e0b96e482
|
datetime
|
2024-09-04 09:13:59 +08:00 |
|
sxu
|
8e02043b06
|
智慧工程
|
2024-09-03 19:08:32 +08:00 |
|
sxu
|
088fdd2ed1
|
智慧工程
|
2024-09-03 18:00:27 +08:00 |
|
sxu
|
5d4c26e516
|
智慧工程
|
2024-09-03 16:47:09 +08:00 |
|
liang.chao
|
8cbccd557a
|
代码中金额、数量类型修改
|
2024-09-02 17:48:26 +08:00 |
|
sxu
|
2a4a29826f
|
修复配置文件
|
2024-09-02 17:03:28 +08:00 |
|
sxu
|
dc5136bee4
|
推送装备
|
2024-09-02 16:49:36 +08:00 |
|
liang.chao
|
7d12bce02e
|
Merge branch 'test-0831-audit'
|
2024-09-02 09:22:45 +08:00 |
|
liang.chao
|
72ac98b92d
|
成套机具bug修改
|
2024-08-30 18:01:35 +08:00 |
|
liang.chao
|
fcf9ea9deb
|
成套机具bug修改
|
2024-08-30 15:56:57 +08:00 |
|
liang.chao
|
184f07d25c
|
配置文件环境修改
|
2024-08-30 15:54:45 +08:00 |
|
sxu
|
2586e0c0f9
|
退料接收优化
|
2024-08-30 11:21:55 +08:00 |
|
sxu
|
9adc35060c
|
退料接收优化
|
2024-08-30 10:35:54 +08:00 |
|
sxu
|
8f92064339
|
加日志
|
2024-08-30 09:27:44 +08:00 |
|
sxu
|
6a8aca42f2
|
修复盘点编码入库后显示多个订单的问题
|
2024-08-29 18:20:05 +08:00 |
|
sxu
|
56c841fc01
|
退料接收时,检查结算表拿到待退料数量,防止多退
|
2024-08-28 17:44:50 +08:00 |
|
sxu
|
dbbed27ed2
|
退料接收时,检查结算表拿到待退料数量,防止多退
|
2024-08-28 17:15:04 +08:00 |
|
wcy
|
bed8fadba7
|
二级库bug修改
|
2024-08-28 16:08:36 +08:00 |
|
wcy
|
6abd590b97
|
二级库sql receiveNum修改
|
2024-08-28 15:05:51 +08:00 |
|
liang.chao
|
a0b943f19a
|
字段表增加费用承担方
|
2024-08-28 10:12:31 +08:00 |
|
liang.chao
|
468a1e7635
|
审计代码修改
|
2024-08-27 17:37:24 +08:00 |
|
liang.chao
|
352e5d958f
|
Merge remote-tracking branch 'origin/master'
|
2024-08-27 15:33:11 +08:00 |
|
liang.chao
|
10312ea8e6
|
审计代码修改
|
2024-08-27 15:32:59 +08:00 |
|
liang.chao
|
04131d8524
|
审计代码修改
|
2024-08-27 15:31:21 +08:00 |
|
sxu
|
fd506b38aa
|
matype order
|
2024-08-27 14:03:11 +08:00 |
|
liang.chao
|
746a197914
|
审计代码修改
|
2024-08-27 13:35:47 +08:00 |
|
sxu
|
2a7961c72a
|
部分退料
|
2024-08-27 09:35:18 +08:00 |
|
sxu
|
99fe304cd7
|
fix bug
|
2024-08-26 21:26:03 +08:00 |
|
liang.chao
|
d1aa5f26e6
|
结算月结明细编组功能
|
2024-08-26 10:44:59 +08:00 |
|
sxu
|
ab5b90b85d
|
加保护
|
2024-08-23 17:42:42 +08:00 |
|
liang.chao
|
694c169e48
|
Merge remote-tracking branch 'origin/master'
|
2024-08-23 17:28:45 +08:00 |
|
liang.chao
|
e1bde9f1a1
|
结算导出sheet名称修改
|
2024-08-23 17:28:42 +08:00 |
|
sxu
|
f1f40d92f8
|
协议变量
|
2024-08-23 16:41:32 +08:00 |
|
liang.chao
|
b41dfc7478
|
Merge remote-tracking branch 'origin/master'
|
2024-08-23 16:01:24 +08:00 |
|
liang.chao
|
5c45e2d39d
|
协议都为内部单位
|
2024-08-23 16:01:12 +08:00 |
|
sxu
|
0430a42004
|
Merge branch 'master' of http://192.168.0.56:3000/bonus/cqdevicemgt
|
2024-08-23 15:56:24 +08:00 |
|
sxu
|
857d835e40
|
内外部协议单位
|
2024-08-23 15:56:11 +08:00 |
|
liang.chao
|
18dbf81e27
|
查询退料申请机具类型树
|
2024-08-23 15:36:23 +08:00 |
|
sxu
|
ce5b8221fe
|
退料申请只显示领料的机具类型层级
|
2024-08-23 15:24:41 +08:00 |
|
sxu
|
5640e7cde7
|
退料申请只显示领料的机具类型层级
|
2024-08-23 14:49:08 +08:00 |
|
sxu
|
5cee802676
|
退料申请只显示领料的机具类型层级
|
2024-08-23 13:17:42 +08:00 |
|
liang.chao
|
04256b9154
|
Merge remote-tracking branch 'origin/master'
|
2024-08-23 13:05:07 +08:00 |
|
sxu
|
a88b682939
|
退料申请只显示领料的机具类型层级
|
2024-08-23 13:00:41 +08:00 |
|
sxu
|
9b67c44fe4
|
工地直转点击通过
|
2024-08-23 12:01:41 +08:00 |
|
liang.chao
|
693d3f2907
|
南网结算审核功能新增
|
2024-08-23 11:20:57 +08:00 |
|
sxu
|
c3c32505af
|
add profile
|
2024-08-23 09:56:31 +08:00 |
|
sxu
|
583f632c39
|
add profile
|
2024-08-23 09:39:47 +08:00 |
|
sxu
|
b3cc2cb0c6
|
add profile
|
2024-08-23 09:25:46 +08:00 |
|
sxu
|
cab68ff11b
|
领退料综合查询
|
2024-08-22 15:51:06 +08:00 |
|
liang.chao
|
0dfd32755a
|
成套代码修改提交
|
2024-08-22 14:44:36 +08:00 |
|
sxu
|
1fad55d44e
|
退料报废转到维修
|
2024-08-22 13:44:10 +08:00 |
|
sxu
|
17b9b5c1a6
|
报废驳回进维修
|
2024-08-22 13:26:07 +08:00 |
|
sxu
|
21656e0515
|
报废驳回进维修
|
2024-08-22 13:20:54 +08:00 |
|
sxu
|
ae7afcde25
|
报废驳回进维修
|
2024-08-22 12:47:51 +08:00 |
|
liang.chao
|
566f8a6b08
|
Merge branch 'macode20240818'
|
2024-08-21 19:39:00 +08:00 |
|
liang.chao
|
853af3721b
|
禅道bug修改
|
2024-08-21 19:35:57 +08:00 |
|
sxu
|
6b707ff353
|
新增type时判断是否重名
|
2024-08-21 18:33:08 +08:00 |
|
sxu
|
97136aecc9
|
领料人
|
2024-08-21 16:50:10 +08:00 |
|
sxu
|
7d2e6987ef
|
领料人
|
2024-08-21 15:13:12 +08:00 |
|
sxu
|
db4d44e1e7
|
重构编码设备库存逻辑
|
2024-08-20 17:45:27 +08:00 |
|
sxu
|
dc64b2ff4d
|
重构编码设备库存逻辑
|
2024-08-20 15:45:36 +08:00 |
|
sxu
|
d2ed1ceec8
|
fix issue
|
2024-08-20 15:42:25 +08:00 |
|
sxu
|
1acc30f410
|
fix issue
|
2024-08-20 15:41:44 +08:00 |
|
sxu
|
b3af31388b
|
fix issue
|
2024-08-20 14:56:05 +08:00 |
|
sxu
|
a71b69eefd
|
fix issue
|
2024-08-20 13:14:40 +08:00 |
|
sxu
|
d98763456c
|
fix issue
|
2024-08-20 10:20:55 +08:00 |
|
sxu
|
41a39c28ff
|
fix issue
|
2024-08-20 10:17:41 +08:00 |
|
sxu
|
7e9edd003e
|
fix issue
|
2024-08-20 09:50:56 +08:00 |
|
sxu
|
b2b1a25822
|
fix issue
|
2024-08-20 09:48:44 +08:00 |
|
sxu
|
ae2837fed9
|
退料接收返回库管员
|
2024-08-19 19:48:02 +08:00 |
|
sxu
|
4293d5a562
|
退料接收返回库管员
|
2024-08-19 19:18:24 +08:00 |
|
sxu
|
90d218ddb3
|
退料接收返回库管员
|
2024-08-19 18:22:30 +08:00 |
|
sxu
|
9443198007
|
Merge branch 'master' into macode20240818
|
2024-08-19 17:36:12 +08:00 |
|
sxu
|
5ba4540133
|
退料接收返回库管员
|
2024-08-19 16:04:02 +08:00 |
|
sxu
|
25523e3f4b
|
领料审核库存
|
2024-08-19 14:54:28 +08:00 |
|
sxu
|
29f45e6103
|
领料审核库存
|
2024-08-19 13:53:44 +08:00 |
|
sxu
|
474cc56964
|
领料审核库存
|
2024-08-19 13:20:48 +08:00 |
|
sxu
|
2b0c9ecbe2
|
move select to material
|
2024-08-19 13:19:20 +08:00 |
|
sxu
|
d7e54f74cb
|
move select to material
|
2024-08-19 13:02:06 +08:00 |
|
sxu
|
d50a79de5c
|
防重复
|
2024-08-19 12:41:24 +08:00 |
|
sxu
|
a926523f28
|
防重复
|
2024-08-19 12:22:38 +08:00 |
|
sxu
|
1c01c7dc38
|
防重复
|
2024-08-19 10:59:18 +08:00 |
|
sxu
|
14bd9d1642
|
Merge remote-tracking branch 'origin' into macode20240818
|
2024-08-19 10:54:45 +08:00 |
|
sxu
|
09a2c9e855
|
app查看公告
|
2024-08-19 09:59:28 +08:00 |
|
sxu
|
3465f8e6fa
|
防重复提交
|
2024-08-19 09:29:36 +08:00 |
|
sxu
|
bb561624e5
|
编码设备库存
|
2024-08-18 09:28:10 +08:00 |
|
sxu
|
ee70d65a5c
|
编码设备库存
|
2024-08-18 09:26:06 +08:00 |
|
sxu
|
1d273580e5
|
编码设备库存
|
2024-08-18 09:03:29 +08:00 |
|
sxu
|
7764b09927
|
change profile
|
2024-08-16 19:19:11 +08:00 |
|
sxu
|
854a9b3dc4
|
change profile
|
2024-08-16 19:12:50 +08:00 |
|
liang.chao
|
b07473f2ea
|
结算代码提交
|
2024-08-16 17:21:36 +08:00 |
|
liang.chao
|
c9b28aff01
|
结算代码提交
|
2024-08-16 17:20:31 +08:00 |
|
liang.chao
|
0247e3e407
|
结算代码提交
|
2024-08-16 15:54:39 +08:00 |
|
liang.chao
|
012ae95238
|
结算代码提交
|
2024-08-16 14:23:52 +08:00 |
|
liang.chao
|
5b1ff9ee80
|
依赖提交
|
2024-08-16 10:50:14 +08:00 |
|
liang.chao
|
5271ebe0bd
|
Merge branch 'lc20240808'
|
2024-08-16 10:48:47 +08:00 |
|
liang.chao
|
16f03e826c
|
结算功能代码提交
|
2024-08-16 10:42:13 +08:00 |
|
sxu
|
f0256a5ce1
|
fix path
|
2024-08-15 15:45:42 +08:00 |
|
15856
|
581ddd9582
|
对获取用户信息进行优化
|
2024-08-15 15:03:26 +08:00 |
|
15856
|
67b80c13f3
|
重庆bug修复
|
2024-08-15 14:37:33 +08:00 |
|
15856
|
e95b3d35ff
|
ito测试问题修复，app预警内容推送
|
2024-08-15 14:36:09 +08:00 |
|
liang.chao
|
4efbea7893
|
Merge branch 'lc20240808'
|
2024-08-15 14:32:57 +08:00 |
|
liang.chao
|
fde16015f8
|
结算功能代码提交
|
2024-08-15 14:30:15 +08:00 |
|
sxu
|
8b932e9f6d
|
结算优化
|
2024-08-15 14:07:24 +08:00 |
|
sxu
|
0d2c680eac
|
结算
|
2024-08-15 09:25:24 +08:00 |
|
sxu
|
69c3b7a0fb
|
结算优化
|
2024-08-14 18:25:32 +08:00 |
|
liang.chao
|
699e66ee32
|
Merge branch 'master' into lc20240808
|
2024-08-13 10:57:45 +08:00 |
|
sxu
|
5dae109c54
|
fix bug
|
2024-08-13 10:44:27 +08:00 |
|
liang.chao
|
340acdd299
|
Revert "fix bug"
This reverts commit d2098dab1b.
|
2024-08-13 10:37:46 +08:00 |
|
liang.chao
|
d2098dab1b
|
fix bug
|
2024-08-13 10:33:38 +08:00 |
|
liang.chao
|
ee396ed430
|
结算功能完善
|
2024-08-13 09:07:25 +08:00 |
|
sxu
|
5f45a1eb87
|
合并配件导入问题
|
2024-08-12 18:25:11 +08:00 |
|
liang.chao
|
a2baadf840
|
结算功能完善
|
2024-08-09 17:03:26 +08:00 |
|
liang.chao
|
84e3e319fa
|
Merge branch 'master' into lc20240808
|
2024-08-09 11:00:34 +08:00 |