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 |
|
zhoukeda
|
1e21885da5
|
根据id获取组织扩展属性接口
|
2023-08-01 17:04:23 +08:00 |
|
FanLian
|
99859ac4d1
|
增加
|
2023-08-01 16:52:39 +08:00 |
|
FanLian
|
8e168c7b52
|
1
|
2023-08-01 16:52:23 +08:00 |
|
alex
|
ab4d0544df
|
新增创建任务链接口
|
2023-08-01 16:51:24 +08:00 |
|
alex
|
a9c9c8d74b
|
1
|
2023-08-01 16:46:30 +08:00 |
|
alex
|
9bb775f00e
|
新增Http请求帮助类，设备接口提供程序服务类
|
2023-08-01 16:46:15 +08:00 |
|
FanLian
|
8b581ab757
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-01 10:49:36 +08:00 |
|
FanLian
|
d6c33d91c1
|
增加预任务的点位ID和点位编号，更改任务执行字段
|
2023-08-01 10:49:30 +08:00 |
|
alex
|
de2ad9b2d0
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-31 17:28:11 +08:00 |
|
alex
|
5e6e01a99a
|
调整，齐套出库、齐套分拣，代码
|
2023-07-31 17:28:08 +08:00 |
|
FanLian
|
e8e590ba1b
|
出库策略更改
|
2023-07-31 17:27:25 +08:00 |
|
FanLian
|
9d4ceff2b8
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-31 16:56:26 +08:00 |
|
FanLian
|
8d0fb291e9
|
出库申请，出库策略
|
2023-07-31 16:56:21 +08:00 |
|
alex
|
ed54413f42
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-31 16:54:46 +08:00 |
|
alex
|
e3e9bdf090
|
1
|
2023-07-31 16:54:42 +08:00 |
|
FanLian
|
f50942fbaf
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-31 16:34:49 +08:00 |
|
FanLian
|
5416aff03e
|
增加出库策略
|
2023-07-31 16:34:44 +08:00 |
|
alex
|
6f5a066a99
|
1
|
2023-07-31 16:34:11 +08:00 |
|
alex
|
61cb73711f
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-31 16:21:30 +08:00 |
|
alex
|
7f5f52c7da
|
出库策略代码调整
|
2023-07-31 16:21:26 +08:00 |
|