Commit Graph

1097 Commits

Author SHA1 Message Date
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
FanLian
56c15393c9 出库策略错误更改 2023-08-03 17:41:40 +08:00
zhoukeda
3d0747ae8e Merge remote-tracking branch 'origin/dev' into dev 2023-08-03 17:29:05 +08:00
zhoukeda
5c0a184cdd 1 2023-08-03 17:28:53 +08:00
FanLian
a115aba87e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-03 17:05:41 +08:00
FanLian
d0e66990cd 齐套分拣的org_id 的user可能为空,空载具出库出库策略更改 2023-08-03 17:05:36 +08:00
alex
59ac005bf3 定时任务去除await,否则导致后面的代码不能执行 2023-08-03 17:05:06 +08:00
FanLian
2fdcf99807 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-03 15:28:51 +08:00
FanLian
dfd3b1fcb9 变量命名修正 2023-08-03 15:28:46 +08:00
FanLian
baa24dc83e 1 2023-08-03 15:26:13 +08:00
alex
f326ea0fd4 1 2023-08-03 15:23:35 +08:00
FanLian
5defa98b47 1.相关业务增加source_id和source_code
2.入库申请查询明细单增加仓库名称回传字段
2023-08-03 15:23:28 +08:00
alex
804cd15a45 删除无用代码 2023-08-03 15:22:54 +08:00
alex
a2b82ad21a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-03 15:18:07 +08:00
alex
adda03e0fb Wms自定义定时服务代码完善 2023-08-03 15:18:00 +08:00
PhilPan
ec69cc94e8 增加视图模型引擎模块 2023-08-02 17:52:00 +08:00
alex
a07b3c73fc Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-02 17:50:58 +08:00
alex
e685faca9e WMS新增,自定义定时任务 2023-08-02 17:50:51 +08:00
FanLian
981662037e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-02 16:39:31 +08:00
FanLian
0b32cbb540 增加设备ID 2023-08-02 16:39:26 +08:00
zhoukeda
be1420e0ca Merge remote-tracking branch 'origin/dev' into dev 2023-08-02 15:58:17 +08:00
zhoukeda
ff966fd569 PDA齐套出库申请 2023-08-02 15:58:08 +08:00
FanLian
9b4e76192a 1 2023-08-02 10:47:58 +08:00
FanLian
d3fdf5a3df 1 2023-08-02 10:45:51 +08:00
FanLian
21c5f75741 报错修改 2023-08-02 10:40:54 +08:00
alex
fa556a9b8b 1 2023-08-02 10:24:20 +08:00
alex
a82079b96d 调整调用第三方接口代码 2023-08-02 10:23:15 +08:00
FanLian
bcb17da3fc Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-02 10:21:55 +08:00
FanLian
8e0e0c3ced 1 2023-08-02 10:21:38 +08:00
FanLian
9587a90987 1.设备接口提供服务程序更新
2.入库策略增加库位类型判断
3.解决空载具入库库位不加锁的bug
2023-08-02 10:21:13 +08:00
zhoukeda
abe7edb936 bug 2023-08-01 17:20:20 +08:00
zhoukeda
c0f52a88d9 Merge remote-tracking branch 'origin/dev' into dev 2023-08-01 17:04:32 +08:00