zhoukeda
|
c18e5cd2d1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-23 15:38:26 +08:00 |
|
zhoukeda
|
4071804c63
|
1
|
2023-11-23 15:38:18 +08:00 |
|
yang.lee
|
d92b1fa366
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-23 14:49:43 +08:00 |
|
yang.lee
|
c879f0b6bd
|
1
|
2023-11-23 14:49:38 +08:00 |
|
zhoukeda
|
2569c03d4a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-23 14:41:15 +08:00 |
|
zhoukeda
|
6840cfcbb1
|
1
|
2023-11-23 14:41:06 +08:00 |
|
yang.lee
|
87e8e40ebc
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-23 14:13:11 +08:00 |
|
yang.lee
|
71c4dbd254
|
1、新增预任务生成帮助类
2、齐套配送接口参数调整
|
2023-11-23 14:13:03 +08:00 |
|
qianjiawei
|
23ab9fa523
|
shucai
|
2023-11-23 10:57:50 +08:00 |
|
zhoukeda
|
1b5422c5ec
|
1
|
2023-11-23 10:45:51 +08:00 |
|
yang.lee
|
242ec34a9a
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-23 10:43:31 +08:00 |
|
yang.lee
|
171b39de9e
|
盘点签收接口逻辑代码调整
|
2023-11-23 10:43:26 +08:00 |
|
zhoukeda
|
24d8363096
|
1
|
2023-11-23 09:58:41 +08:00 |
|
zhoukeda
|
2524db7e1e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-23 09:36:26 +08:00 |
|
zhoukeda
|
6d3c288e1e
|
1
|
2023-11-23 09:36:17 +08:00 |
|
yang.lee
|
ff0ce28760
|
解决代码冲突
|
2023-11-23 09:27:30 +08:00 |
|
yang.lee
|
b770e0d83d
|
1、agv 信息获取新增swagger备注
2、新增盘点签收相关功能接口
|
2023-11-23 09:26:02 +08:00 |
|
zhoukeda
|
10ae6ad642
|
1
|
2023-11-23 09:18:52 +08:00 |
|
zhoukeda
|
0dc9ef9e3f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-23 08:42:10 +08:00 |
|
hlb
|
0f266e05ca
|
多任务时增加相等情况
|
2023-11-22 23:19:20 +08:00 |
|
zhoukeda
|
e002f164c2
|
1
|
2023-11-22 18:08:07 +08:00 |
|
zhoukeda
|
805e16c960
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-22 17:33:20 +08:00 |
|
zhoukeda
|
88e6fb700e
|
1
|
2023-11-22 17:33:12 +08:00 |
|
hlb
|
fb9e44e46a
|
MES出库先不用回传
|
2023-11-22 16:53:30 +08:00 |
|
hlb
|
2bb2081a07
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-22 16:51:01 +08:00 |
|
hlb
|
9af56baece
|
MES生产入库先不回传
|
2023-11-22 16:50:51 +08:00 |
|
zhoukeda
|
d09d2c6370
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-22 16:04:20 +08:00 |
|
zhoukeda
|
9cfc0a0e8a
|
1
|
2023-11-22 16:02:09 +08:00 |
|
hlb
|
41064d17ba
|
盘点任务的预任务增加点位信息
|
2023-11-22 15:22:36 +08:00 |
|
qianjiawei
|
e35811b36d
|
redis定时
|
2023-11-22 14:33:16 +08:00 |
|
zhoukeda
|
f84883811b
|
1
|
2023-11-22 14:31:08 +08:00 |
|
yang.lee
|
e2f7309903
|
1
|
2023-11-22 10:59:31 +08:00 |
|
yang.lee
|
1f781859e8
|
盘点任务bug处理
|
2023-11-22 10:39:31 +08:00 |
|
yang.lee
|
e20440c87f
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-21 16:41:47 +08:00 |
|
yang.lee
|
c51f995bfd
|
针对潍柴项目，新增模拟获取Agv信息，实时数据接口
|
2023-11-21 16:41:41 +08:00 |
|
fei.pan
|
41db1d9911
|
暂时支持q参数
|
2023-11-21 11:07:58 +08:00 |
|
yang.lee
|
121cddf493
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-21 09:24:57 +08:00 |
|
yang.lee
|
f1e97f37d8
|
载具批量新增代码调整
|
2023-11-21 09:24:48 +08:00 |
|
zhoukeda
|
319d4662e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-21 09:13:14 +08:00 |
|
zhoukeda
|
8f61e8d4a3
|
1
|
2023-11-21 09:13:04 +08:00 |
|
fei.pan
|
70de358f97
|
完善通用接口输入参数
|
2023-11-21 00:19:45 +08:00 |
|
yang.lee
|
079eec500b
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-20 11:51:20 +08:00 |
|
yang.lee
|
82dfc486bf
|
载具新增批量新增接口
|
2023-11-20 11:51:13 +08:00 |
|
zhoukeda
|
962df6c8de
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-20 11:23:30 +08:00 |
|
zhoukeda
|
ed23045258
|
组装任务下发添加创建时间
|
2023-11-20 11:23:20 +08:00 |
|
yang.lee
|
fd31f60c46
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-20 09:34:31 +08:00 |
|
yang.lee
|
337e9945cf
|
调整自定义日志
|
2023-11-20 09:34:23 +08:00 |
|
hlb
|
584c5bf188
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-18 15:56:38 +08:00 |
|
hlb
|
21659115b0
|
回库时业务为 载具移入
|
2023-11-18 15:56:29 +08:00 |
|
yang.lee
|
8a37f57cf6
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-17 16:02:05 +08:00 |
|