Commit Graph

1589 Commits

Author SHA1 Message Date
yang.lee
e56d58a97c carry查询 新增物料名称 2023-11-10 16:36:06 +08:00
yang.lee
86b766500b 优化采购收货,销售发货同步mes数据代码 2023-11-10 11:02:48 +08:00
yang.lee
92a3e9904f +1 2023-11-10 10:41:37 +08:00
yang.lee
ae2446eef0 修改 反审核值 2023-11-10 10:01:08 +08:00
yang.lee
40dad6b4e8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-09 17:39:03 +08:00
yang.lee
60b2a90bdf Release发布时,选中质检模块 2023-11-09 17:38:58 +08:00
qianjiawei
63dd12b0a1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-09 16:58:18 +08:00
qianjiawei
1976ae24fd redis读取可配置 2023-11-09 16:58:11 +08:00
yang.lee
e7d9ad29ff 删除Tnb.WarehouseMgr.csproj 文件无用标签 2023-11-09 16:55:47 +08:00
yang.lee
d337a35e0a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-09 16:27:35 +08:00
yang.lee
665286f997 任务结束时调用 ,预任务执行 2023-11-09 16:27:30 +08:00
zhoukeda
330f1e5b04 Merge remote-tracking branch 'origin/dev' into dev 2023-11-09 16:00:12 +08:00
zhoukeda
753e24741b 调整喷码贴标 2023-11-09 16:00:05 +08:00
yang.lee
869c05c790 删除预任务生成执行后,目标库位占用赋值 2023-11-09 15:56:50 +08:00
yang.lee
7e0a89b0a2 过滤预任务新增库位不能占用条件 2023-11-09 15:31:05 +08:00
yang.lee
5f49f57b4d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-09 15:20:35 +08:00
yang.lee
00c11a4515 调整预任务生成代码逻辑 2023-11-09 15:20:27 +08:00
zhoukeda
fa292dea76 Merge remote-tracking branch 'origin/dev' into dev 2023-11-09 14:39:08 +08:00
zhoukeda
bf47dca08a 保养记录执行了才生成下一条 2023-11-09 14:38:58 +08:00
yang.lee
d757785f0b EnumTaskChainType新增,电梯,输送线 2023-11-09 11:48:45 +08:00
yang.lee
1b3b30662c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-09 11:03:58 +08:00
yang.lee
49dcc79b6a Agv任务状态返回,出发预任务执行函数 2023-11-09 11:03:52 +08:00
zhoukeda
5a9f31c451 Merge remote-tracking branch 'origin/dev' into dev 2023-11-09 10:58:24 +08:00
zhoukeda
746e7f425d 外包装入库申请 2023-11-09 10:58:15 +08:00
yang.lee
56818634be Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-09 10:42:55 +08:00
yang.lee
79c066ec2d 调整预任务获取条件过滤 2023-11-09 10:42:49 +08:00
fei.pan
36fbb3ab18 Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev 2023-11-09 10:21:40 +08:00
fei.pan
cacf974527 模型通用接口List改为用left join 2023-11-09 10:21:31 +08:00
yang.lee
9afe7d94c1 +1 2023-11-09 10:09:05 +08:00
yang.lee
fc54814fae 1 2023-11-09 10:04:35 +08:00
yang.lee
e9259ce8ad 预任务执行,Agv及电梯任务根据配置执行 2023-11-09 10:03:30 +08:00
yang.lee
68efc42e31 解决未实现指定接口约束问题 2023-11-09 08:59:13 +08:00
yang.lee
449303161e +1 2023-11-08 17:35:57 +08:00
yang.lee
3beb03de18 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 17:07:55 +08:00
yang.lee
cb359b4ef9 调整出库申请代码逻辑 2023-11-08 17:07:50 +08:00
qianjiawei
f8cf67150a redis 2023-11-08 16:54:15 +08:00
qianjiawei
7f3c8b1de9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 16:52:26 +08:00
qianjiawei
be8b061de3 质检 2023-11-08 16:51:20 +08:00
zhoukeda
dd9a84bdae Merge remote-tracking branch 'origin/dev' into dev 2023-11-08 16:50:02 +08:00
zhoukeda
ee0663aaaa 外包装入库申请 2023-11-08 16:49:52 +08:00
yang.lee
6bb3db57aa +1 2023-11-08 16:48:15 +08:00
yang.lee
225a00c9e2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 16:48:05 +08:00
yang.lee
e9b33e1bd6 +1 2023-11-08 16:47:58 +08:00
hlb
b6129ee807 修改空载具出库判断 2023-11-08 16:41:33 +08:00
yang.lee
60ff5d69bb +1 2023-11-08 16:38:50 +08:00
yang.lee
e808092ad8 采购收货,销售发货新增对外接口 2023-11-08 16:36:42 +08:00
yang.lee
8f00f2b688 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 16:24:52 +08:00
yang.lee
7980e342c0 新增Mes检验结束后,回调通知功能 2023-11-08 16:24:47 +08:00
qianjiawei
2619a011af 质检任务 2023-11-08 16:19:30 +08:00
qianjiawei
5504703f3a 质检任务 2023-11-08 15:58:39 +08:00