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 |
|
alex
|
0d154779e6
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-04 15:05:04 +08:00 |
|
alex
|
4381e77b7f
|
新增，库存报表业务接口
|
2023-08-04 15:05:00 +08:00 |
|
FanLian
|
0756b27bea
|
定时任务增加非调试状态编译条件
|
2023-08-04 14:28:36 +08:00 |
|
FanLian
|
32ccb2d54e
|
令牌放入缓存
|
2023-08-04 14:21:55 +08:00 |
|
alex
|
a47c779c3a
|
1
|
2023-08-04 13:35:48 +08:00 |
|
alex
|
a6ad99a5bc
|
UserManager新增分部类，定义访问令牌，用于定时任务解析当前登录用户信息
|
2023-08-04 12:59:31 +08:00 |
|
FanLian
|
39c445fca0
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-04 11:41:32 +08:00 |
|
FanLian
|
772ca35dc1
|
业务代码更改
|
2023-08-04 11:40:20 +08:00 |
|
alex
|
987d4ac652
|
1
|
2023-08-04 11:39:54 +08:00 |
|
alex
|
6ad92877b9
|
1
|
2023-08-04 11:27:37 +08:00 |
|
alex
|
cf23a50ee9
|
1
|
2023-08-04 11:27:35 +08:00 |
|
alex
|
e892c08734
|
还原代码解决系统崩溃问题
|
2023-08-04 11:26:08 +08:00 |
|
alex
|
f0e859a203
|
1
|
2023-08-04 10:38:53 +08:00 |
|
alex
|
914529b8a5
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-04 10:10:28 +08:00 |
|
alex
|
b5916b4c0e
|
用户登录、登出通知Wms定时服务的启动预关闭
|
2023-08-04 10:10:23 +08:00 |
|
FanLian
|
e2ec402a9a
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-04 10:08:32 +08:00 |
|
FanLian
|
04fe68fd1c
|
生成齐套入库的参数修正
|
2023-08-04 10:08:24 +08:00 |
|
alex
|
b3087b8f64
|
1
|
2023-08-04 09:04:11 +08:00 |
|
alex
|
7d86948fb0
|
1
|
2023-08-03 17:58:24 +08:00 |
|
alex
|
78c09c9548
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-03 17:47:53 +08:00 |
|
alex
|
3273ac0cec
|
1
|
2023-08-03 17:47:49 +08:00 |
|
FanLian
|
1e65480fd7
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-03 17:41:46 +08:00 |
|