alex
|
e4cbbe4bfb
|
新增 ，定时器自定义异常类
|
2023-08-09 14:20:50 +08:00 |
|
alex
|
3d66e60477
|
创建任务链类型改为CTU
|
2023-08-09 10:58:13 +08:00 |
|
alex
|
7a98d8a72f
|
新增，任务链类型枚举
|
2023-08-09 10:49:47 +08:00 |
|
alex
|
ca6312f3ea
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-09 08:53:42 +08:00 |
|
alex
|
e2d41a1f54
|
设备第三方提供接口改为匿名方式调用
|
2023-08-09 08:53:35 +08:00 |
|
FanLian
|
3e1190f54a
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-09 08:14:01 +08:00 |
|
FanLian
|
01269093d2
|
修改导出模板信息时，保留弹窗选择控件
|
2023-08-09 08:13:55 +08:00 |
|
alex
|
3e889495f3
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-08 15:15:59 +08:00 |
|
alex
|
446c4e45c8
|
调整调用Agv创建任务链代码逻辑
|
2023-08-08 15:15:53 +08:00 |
|
FanLian
|
dfd2b7ddb5
|
1
|
2023-08-08 15:13:01 +08:00 |
|
FanLian
|
6c37fcdb0a
|
修改联核接口Taskcode
|
2023-08-08 15:12:30 +08:00 |
|
alex
|
7b02f83a67
|
1
|
2023-08-08 10:27:12 +08:00 |
|
alex
|
75f9b45e5c
|
修改联合接口地址的请求IP端口
|
2023-08-08 10:26:42 +08:00 |
|
FanLian
|
ea0f71ac19
|
重写库位定义导入功能
|
2023-08-08 10:19:34 +08:00 |
|
alex
|
abb9663485
|
将Excel数据导入提取到单独的类中
|
2023-08-08 09:26:22 +08:00 |
|
alex
|
bd2af7dccf
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-08 09:15:57 +08:00 |
|
alex
|
57e837c2de
|
1
|
2023-08-08 09:15:54 +08:00 |
|
FanLian
|
fabf6a2f4e
|
增加载具导入功能
|
2023-08-08 09:15:17 +08:00 |
|
FanLian
|
744d053801
|
1
|
2023-08-07 17:53:34 +08:00 |
|
FanLian
|
1ebf011961
|
1
|
2023-08-07 17:50:55 +08:00 |
|
FanLian
|
3deea63f3f
|
1
|
2023-08-07 17:49:21 +08:00 |
|
FanLian
|
96a99ed2dc
|
导入功能修改
|
2023-08-07 17:48:36 +08:00 |
|
alex
|
27bb5692b8
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-07 17:48:24 +08:00 |
|
alex
|
85e0daf233
|
载具台账接口代码调整
|
2023-08-07 17:48:18 +08:00 |
|
FanLian
|
b895b49f51
|
1
|
2023-08-07 16:59:07 +08:00 |
|
FanLian
|
6f93fb2363
|
1
|
2023-08-07 16:58:51 +08:00 |
|
FanLian
|
3337e4cc89
|
更改导入接口
|
2023-08-07 16:54:01 +08:00 |
|
alex
|
65fbaad9c0
|
1
|
2023-08-07 16:30:19 +08:00 |
|
alex
|
af9265ea20
|
BaseWarehouse类，新增 ImportExcelToMemory,DataImport函数
|
2023-08-07 16:30:07 +08:00 |
|
FanLian
|
6602a4d7d2
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-07 15:13:28 +08:00 |
|
FanLian
|
1e108645ef
|
1
|
2023-08-07 15:13:24 +08:00 |
|
FanLian
|
231f84eedf
|
增加Wms导入和导出功能，载具导入
|
2023-08-07 15:13:16 +08:00 |
|
alex
|
d99d38e0c1
|
优化TimedTaskBackgroundService类代码
|
2023-08-07 13:49:36 +08:00 |
|
alex
|
3923c6a698
|
1、生成预任务执行调用Wcs生成任务链接口
2、Common新增ConfigurationExtenstions扩展类
|
2023-08-07 13:32:59 +08:00 |
|
alex
|
5d2b41fa72
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-07 09:06:13 +08:00 |
|
alex
|
e543d984e6
|
1、盘点报表函数新增分页功能
2、齐套分拣，调整分拣函数获取当前登录用户方式
|
2023-08-07 09:06:08 +08:00 |
|
zhoukeda
|
e7fb2f8c0a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-08-04 17:39:18 +08:00 |
|
zhoukeda
|
440d4d9fc3
|
停机时长维修时长字段字符串改数字类型
|
2023-08-04 17:39:11 +08:00 |
|
FanLian
|
8e186c87e5
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-04 17:17:59 +08:00 |
|
FanLian
|
5dd64cef9e
|
1
|
2023-08-04 17:17:54 +08:00 |
|
alex
|
aa130655c6
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-04 17:17:34 +08:00 |
|
alex
|
31a1f8a149
|
1
|
2023-08-04 17:17:31 +08:00 |
|
FanLian
|
6609caff10
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-04 15:31:32 +08:00 |
|
FanLian
|
67dc22f9b9
|
载具条码增加仓库ID
|
2023-08-04 15:31:28 +08:00 |
|
qianjiawei
|
c8088ca739
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-04 15:10:20 +08:00 |
|
qianjiawei
|
9559165536
|
1
|
2023-08-04 15:10:14 +08:00 |
|
alex
|
ae76e93130
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-04 15:05:48 +08:00 |
|
alex
|
64f50721d4
|
消除齐套出库警告
|
2023-08-04 15:05:45 +08:00 |
|
FanLian
|
53c9f6619d
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-04 15:05:11 +08:00 |
|
FanLian
|
77b4c2b7b8
|
增加库存报表主表
|
2023-08-04 15:05:05 +08:00 |
|