Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 6d930b53e5 BUG qianjiawei 2023-11-16 13:50:51 +08:00
• 18c1b89569 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-11-16 13:36:28 +08:00
• 8860044e92 模具质检BUG qianjiawei 2023-11-16 13:36:15 +08:00
• b187c92e41 1 yang.lee 2023-11-16 11:56:40 +08:00
• 86c0c0ee3a 修复bug yang.lee 2023-11-16 11:53:47 +08:00
• 68195fe844 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-16 11:53:39 +08:00
• ff37e58ef8 修复bug yang.lee 2023-11-16 11:53:19 +08:00
• 6b642324f7 1 zhoukeda 2023-11-16 09:49:15 +08:00
• e29d74844c 任务单操作记录列表修改 zhoukeda 2023-11-16 09:26:53 +08:00
• 98d0fd1004 1 yang.lee 2023-11-15 14:30:26 +08:00
• f825db530e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-15 14:29:46 +08:00
• 4f0211ee3a wms删除无用代码类 yang.lee 2023-11-15 14:29:39 +08:00
• 60d938b750 清除common.props fei.pan 2023-11-15 14:20:43 +08:00
• 9c03ef2bcc 完善模型通用接口的无限层级一对一和单层级一对多 fei.pan 2023-11-15 13:43:24 +08:00
• d800987307 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-15 11:30:02 +08:00
• d9182f89b7 生产bom复制 zhoukeda 2023-11-15 11:29:53 +08:00
• 6702dac9c3 工单查询多几个条件 zhoukeda 2023-11-15 11:07:38 +08:00
• 15cabb865e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-15 10:16:42 +08:00
• d606315f94 1、调整盘点任务动态生成查询条件 2、LambdaExpressionExtensions 新增表达式树扩展 yang.lee 2023-11-15 10:16:34 +08:00
• e13f1fd3d2 重写在库物料维护 hlb 2023-11-15 09:25:58 +08:00
• 5714e38ffc 修改盘点任务代码 yang.lee 2023-11-14 18:00:32 +08:00
• 9ea879f865 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-14 17:49:45 +08:00
• f746f7c258 子表信息可以传ids查询 zhoukeda 2023-11-14 17:49:35 +08:00
• e940fd8a31 1 yang.lee 2023-11-14 15:49:03 +08:00
• 347d8676fb 调整盘点任务，新建重写的逻辑代码 yang.lee 2023-11-14 15:44:33 +08:00
• 1535d1532c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-14 15:21:22 +08:00
• 3f6deb4204 调整获取随机数方式 yang.lee 2023-11-14 15:21:18 +08:00
• 8dc10ee1df Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev hlb 2023-11-14 14:56:48 +08:00
• 3fdf4c9516 修改判断条件 hlb 2023-11-14 14:56:40 +08:00
• cd7d12a301 出库申请，分拣出时业务回更，调用载具移入不await yang.lee 2023-11-14 10:28:09 +08:00
• 8e3f2ec579 更新任务实际完成时间 hlb 2023-11-14 09:26:21 +08:00
• 63d1ef3bbf 预任务执行，如果电梯任务，预Agv任务存在相同目标库位，删除Agv任务保证电梯任务先行 yang.lee 2023-11-13 18:32:13 +08:00
• dc8f34e71b 调整 第三方设备类型枚举顺序， yang.lee 2023-11-13 15:55:00 +08:00
• ffc097a3c3 空载具出库为单载具新增 hlb 2023-11-13 15:33:17 +08:00
• 8ee8fe995e 修改任务起始值 hlb 2023-11-13 15:23:09 +08:00
• 82909e116d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev hlb 2023-11-13 15:18:42 +08:00
• 1ac220b170 修改 路径算法， 当出现多个载具同时出库，可能需要进入电梯时，需要均匀分配电梯 hlb 2023-11-13 15:18:28 +08:00
• 48a5512d0c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-13 15:17:33 +08:00
• 171dd26dbc 根据盘点类型获取任务明细，删除注释代码 yang.lee 2023-11-13 15:17:28 +08:00
• 8a277c40a1 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-13 15:01:57 +08:00
• 58c05b301b 返回故障名称 zhoukeda 2023-11-13 15:01:49 +08:00
• c86ad9d872 RedisBackGround 报错暂时注掉 yang.lee 2023-11-13 13:51:09 +08:00
• 18c3eb7183 +1 yang.lee 2023-11-13 12:06:33 +08:00
• 386292f710 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-13 12:02:57 +08:00
• 149402ac43 调整根据盘点类型获取任务明细代码 yang.lee 2023-11-13 12:02:52 +08:00
• 3c4147c963 去除获取未下发预任务的锁定条件 hlb 2023-11-13 11:15:25 +08:00
• 30743623cd 新增盘点任务，根据盘点类型获取任务明细信息 yang.lee 2023-11-13 10:49:29 +08:00
• 88bc41885f 获取未下发的预任务，增加目标库位锁定状态 hlb 2023-11-10 16:40:30 +08:00
• 0881843ff9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-10 16:36:13 +08:00
• e56d58a97c carry查询 新增物料名称 yang.lee 2023-11-10 16:36:06 +08:00
• 9ae6886e49 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-11-10 16:04:06 +08:00
• e60dc32456 redis页面 qianjiawei 2023-11-10 16:03:45 +08:00
• 7a94129e35 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev hlb 2023-11-10 14:53:41 +08:00
• 113f67b168 盘点任务增加盘点签收配置 hlb 2023-11-10 14:53:33 +08:00
• fff6e527d3 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-10 13:38:40 +08:00
• 8b3541c950 根据工位获取进行中待开工暂停的任务单信息 zhoukeda 2023-11-10 13:38:32 +08:00
• 86b766500b 优化采购收货，销售发货同步mes数据代码 yang.lee 2023-11-10 11:02:48 +08:00
• 92a3e9904f +1 yang.lee 2023-11-10 10:41:37 +08:00
• ae2446eef0 修改 反审核值 yang.lee 2023-11-10 10:01:08 +08:00
• 40dad6b4e8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-09 17:39:03 +08:00
• 60b2a90bdf Release发布时，选中质检模块 yang.lee 2023-11-09 17:38:58 +08:00
• 63dd12b0a1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-11-09 16:58:18 +08:00
• 1976ae24fd redis读取可配置 qianjiawei 2023-11-09 16:58:11 +08:00
• e7d9ad29ff 删除Tnb.WarehouseMgr.csproj 文件无用标签 yang.lee 2023-11-09 16:55:47 +08:00
• d337a35e0a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-09 16:27:35 +08:00
• 665286f997 任务结束时调用 ，预任务执行 yang.lee 2023-11-09 16:27:30 +08:00
• 330f1e5b04 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-09 16:00:12 +08:00
• 753e24741b 调整喷码贴标 zhoukeda 2023-11-09 16:00:05 +08:00
• 869c05c790 删除预任务生成执行后，目标库位占用赋值 yang.lee 2023-11-09 15:56:50 +08:00
• 7e0a89b0a2 过滤预任务新增库位不能占用条件 yang.lee 2023-11-09 15:31:05 +08:00
• 5f49f57b4d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-09 15:20:35 +08:00
• 00c11a4515 调整预任务生成代码逻辑 yang.lee 2023-11-09 15:20:27 +08:00
• fa292dea76 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-09 14:39:08 +08:00
• bf47dca08a 保养记录执行了才生成下一条 zhoukeda 2023-11-09 14:38:58 +08:00
• d757785f0b EnumTaskChainType新增，电梯，输送线 yang.lee 2023-11-09 11:48:45 +08:00
• 1b3b30662c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-09 11:03:58 +08:00
• 49dcc79b6a Agv任务状态返回，出发预任务执行函数 yang.lee 2023-11-09 11:03:52 +08:00
• 5a9f31c451 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-09 10:58:24 +08:00
• 746e7f425d 外包装入库申请 zhoukeda 2023-11-09 10:58:15 +08:00
• 56818634be Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-09 10:42:55 +08:00
• 79c066ec2d 调整预任务获取条件过滤 yang.lee 2023-11-09 10:42:49 +08:00
• 36fbb3ab18 Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev fei.pan 2023-11-09 10:21:40 +08:00
• cacf974527 模型通用接口List改为用left join fei.pan 2023-11-09 10:21:31 +08:00
• 9afe7d94c1 +1 yang.lee 2023-11-09 10:09:05 +08:00
• fc54814fae 1 yang.lee 2023-11-09 10:04:35 +08:00
• e9259ce8ad 预任务执行，Agv及电梯任务根据配置执行 yang.lee 2023-11-09 10:03:30 +08:00
• 68efc42e31 解决未实现指定接口约束问题 yang.lee 2023-11-09 08:59:13 +08:00
• 449303161e +1 yang.lee 2023-11-08 17:35:57 +08:00
• 3beb03de18 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-08 17:07:55 +08:00
• cb359b4ef9 调整出库申请代码逻辑 yang.lee 2023-11-08 17:07:50 +08:00
• f8cf67150a redis qianjiawei 2023-11-08 16:54:15 +08:00
• 7f3c8b1de9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-11-08 16:52:26 +08:00
• be8b061de3 质检 qianjiawei 2023-11-08 16:51:20 +08:00
• dd9a84bdae Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-08 16:50:02 +08:00
• ee0663aaaa 外包装入库申请 zhoukeda 2023-11-08 16:49:52 +08:00
• 6bb3db57aa +1 yang.lee 2023-11-08 16:48:15 +08:00
• 225a00c9e2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-08 16:48:05 +08:00
• e9b33e1bd6 +1 yang.lee 2023-11-08 16:47:58 +08:00
• b6129ee807 修改空载具出库判断 hlb 2023-11-08 16:41:33 +08:00
• 60ff5d69bb +1 yang.lee 2023-11-08 16:38:50 +08:00