Commit Graph

1056 Commits

Author SHA1 Message Date
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
alex
bc3a0fea43 1、新增出入库策略函数
2、调整更新空载具函数,删除多余参数
2023-07-31 14:46:19 +08:00
alex
11fa4017fa 1 2023-07-31 14:44:21 +08:00
alex
d707daa395 1、出库库策略接口函数新增
2、调整更新 空载具函数,去除多余参数
2023-07-31 14:43:43 +08:00
zhoukeda
5229030165 Merge remote-tracking branch 'origin/dev' into dev 2023-07-31 11:59:18 +08:00
zhoukeda
05dcc210bf 注塑挤出任务单下发列表页添加设备信息 2023-07-31 11:59:10 +08:00
FanLian
b79ce73d42 代码修改 2023-07-31 11:39:57 +08:00
FanLian
ca4e4c34e1 出库签收有carry_code的映射,将carry_id映射成carry_code的值 2023-07-31 11:36:04 +08:00
FanLian
f4814f9af2 报错调整 2023-07-31 11:16:59 +08:00
FanLian
52f709c41a 修改电梯判空 2023-07-31 09:18:45 +08:00
FanLian
b47392f61b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-31 08:38:32 +08:00
FanLian
fe4e0d90b7 调整格式 2023-07-31 08:38:26 +08:00
zhoukeda
c18b937dc1 生产相关列表倒叙,生产工单列表重写 2023-07-28 16:26:27 +08:00
FanLian
a78186d7b0 修改分拣出库相关代码 2023-07-28 13:40:20 +08:00
alex
703eda463e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-28 11:13:56 +08:00
alex
11216f3ab5 载具查询接口,新增判空条件判断 2023-07-28 11:13:51 +08:00
zhoukeda
ae80a0a971 提报数量限制 2023-07-28 09:55:13 +08:00
FanLian
ec0697d5f8 简化 2023-07-27 17:30:14 +08:00
FanLian
8f9ac6af90 平均分配调整 2023-07-27 17:27:36 +08:00
FanLian
e110a80d62 电梯平均分配优化 2023-07-27 17:24:16 +08:00
FanLian
720ef178dd Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-27 17:05:14 +08:00
FanLian
82870e63f9 增加电梯状态判断 2023-07-27 17:05:10 +08:00