Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 07cfa4a14f bug zhou keda 2024-06-29 15:14:50 +08:00
• f13b25fed5 Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-06-29 14:00:46 +08:00
• 448bab4f25 bug zhou keda 2024-06-29 14:00:35 +08:00
• 958d1deb25 生产退料，暂存仓配送优化 majian 2024-06-29 13:23:21 +08:00
• 4d890e2ca2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-29 13:21:39 +08:00
• 3bda36ae02 bug zhou keda 2024-06-29 13:19:01 +08:00
• baa12bff76 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-29 12:30:22 +08:00
• 3c52ad0d27 bug zhou keda 2024-06-29 12:26:12 +08:00
• 65f88dcf8a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-28 16:30:46 +08:00
• cf241dcd56 bug zhou keda 2024-06-28 16:27:30 +08:00
• f802feb2b9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-28 16:06:30 +08:00
• 8a9708ffc7 bug zhou keda 2024-06-28 16:04:51 +08:00
• 8f78a36e17 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-28 13:35:15 +08:00
• 9ebb37033c bug zhou keda 2024-06-28 11:15:17 +08:00
• 8a13c5d593 生产投料 zhou keda 2024-06-28 11:09:03 +08:00
• 6284ea4b56 退料到中储仓 majian 2024-06-27 22:17:23 +08:00
• df0be4e15d 组装下发列表传员工工位 zhou keda 2024-06-27 18:03:07 +08:00
• 42b3352c38 pda任务单列表优化 zhou keda 2024-06-27 17:53:06 +08:00
• d2596984c8 pda任务单列表优化 zhou keda 2024-06-27 17:52:29 +08:00
• c2e9499719 pda任务单列表优化 zhou keda 2024-06-27 17:51:18 +08:00
• 91c451cfc5 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-27 17:14:20 +08:00
• 22b1b80b1e 生产提报日志优化 zhou keda 2024-06-27 17:11:06 +08:00
• 28ef632767 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-27 16:44:05 +08:00
• 9ea21e07cb bug majian 2024-06-27 16:43:51 +08:00
• 398f8f3696 bug zhou keda 2024-06-27 16:42:39 +08:00
• a45bb93e08 bug zhou keda 2024-06-27 16:25:36 +08:00
• d6144650cd bug zhou keda 2024-06-27 16:23:52 +08:00
• 323d18c374 bug zhou keda 2024-06-27 16:23:40 +08:00
• ea93613c82 日志完善 majian 2024-06-27 15:58:09 +08:00
• e0aa944d7d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev Conflicts: ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs majian 2024-06-27 11:22:26 +08:00
• 8177d05cd2 生产退料开发等 majian 2024-06-27 11:15:07 +08:00
• bccf2bca5a 注塑定点配送已下发也不发任务 zhou keda 2024-06-27 11:01:23 +08:00
• fb9ba4b7a8 物料签收bug修改 zhou keda 2024-06-27 09:10:31 +08:00
• 1765ebedc4 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-26 18:19:55 +08:00
• 560465974a bug zhou keda 2024-06-26 17:12:43 +08:00
• c1c9000e0c 二楼物料呼叫取任务单添加条件 majian 2024-06-26 16:56:52 +08:00
• 933744b618 BUG zhou keda 2024-06-26 15:58:46 +08:00
• ade240d8cf Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-06-26 15:12:25 +08:00
• bcfdf31497 bug zhou keda 2024-06-26 15:12:15 +08:00
• 1089bd7f5a 同步料架的载具位置，bug处理，日志完善 majian 2024-06-26 14:27:32 +08:00
• 4ff5b9b9d7 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-26 14:25:50 +08:00
• 5b7e724d58 bug zhou keda 2024-06-26 14:23:34 +08:00
• dce72c4899 BUG zhou keda 2024-06-26 14:00:36 +08:00
• b19eb51755 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-26 11:52:00 +08:00
• ece89a101e 空载具出库优化 zhou keda 2024-06-26 09:58:11 +08:00
• 1d344b4751 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-26 09:23:24 +08:00
• 4bf889a26a BUG zhou keda 2024-06-26 09:19:40 +08:00
• c23ad90963 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-25 17:17:19 +08:00
• 47d4335e01 原材料条码，日志修改 majian 2024-06-25 17:17:09 +08:00
• f1ee8abcef 自动签收 zhou keda 2024-06-25 17:13:21 +08:00
• fd75a23321 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-25 14:34:01 +08:00
• 1906fc9ad3 自动生产提报 zhou keda 2024-06-25 14:23:53 +08:00
• b9666d03ea 配置修改 majian 2024-06-25 11:39:42 +08:00
• 1b078cc0cd Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-25 11:38:19 +08:00
• abd7576065 二楼转库传任务单 majian 2024-06-25 11:38:11 +08:00
• 43d6647bb0 物料签收加个日志 zhou keda 2024-06-25 09:28:21 +08:00
• ca63ca7eb5 bug zhou keda 2024-06-24 17:13:10 +08:00
• 6a85d1119a Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-06-24 15:39:45 +08:00
• 3c6d11ba29 生产提拔注塑件和短管挤出件才返回称重完成 zhou keda 2024-06-24 15:39:33 +08:00
• faf44a8e42 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-24 13:01:55 +08:00
• 7d6602ad12 bug处理 majian 2024-06-24 13:01:42 +08:00
• 7358039095 生产投料解绑载具物料 zhou keda 2024-06-24 11:55:44 +08:00
• a5eb93809d 物料签收 zhou keda 2024-06-24 11:09:16 +08:00
• c0be9943f8 bug zhou keda 2024-06-24 10:09:35 +08:00
• 732dcc6e63 生产提报优化 zhou keda 2024-06-24 10:06:49 +08:00
• 18d4659e80 生产提报优化 zhou keda 2024-06-24 10:06:31 +08:00
• 493547020b 称重修改到提报那 zhou keda 2024-06-24 09:52:57 +08:00
• e1a944099d 符号错误 majian 2024-06-24 09:00:46 +08:00
• cde1c9dfcd bug majian 2024-06-24 00:08:11 +08:00
• 97c81f6050 bug修复,转库单工位带入二楼任务 majian 2024-06-24 00:07:35 +08:00
• af388c17dd 绑定库位 zhou keda 2024-06-21 16:54:58 +08:00
• 112f15a096 物料呼叫接口修改 majian 2024-06-21 16:05:56 +08:00
• f8e3e89b50 Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-06-21 15:39:00 +08:00
• 4de491e331 视觉设备判定记录 zhou keda 2024-06-21 15:38:47 +08:00
• 094414596e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-21 15:16:47 +08:00
• 0095ebec24 完善日志 bug处理 majian 2024-06-21 15:14:30 +08:00
• b522a27ee9 喷码贴标修改 zhou keda 2024-06-21 14:52:32 +08:00
• c0bb859f56 生产提报判定载具是否绑定 zhou keda 2024-06-21 14:08:28 +08:00
• c9ad81052e 优化日志 zhou keda 2024-06-21 10:32:09 +08:00
• f9abb49c3c 贴标喷码优化日志 zhou keda 2024-06-21 10:17:09 +08:00
• 05d38cbb2e 称重优化日志 zhou keda 2024-06-21 10:00:24 +08:00
• f40e3c8b61 注塑定点配完善日志 zhou keda 2024-06-21 09:30:59 +08:00
• 9fead8d3c9 提报增加重量 zhou keda 2024-06-20 14:32:48 +08:00
• def9290c37 预览接口字段报错不走js脚本 zhou keda 2024-06-20 09:13:31 +08:00
• fe8aee0bda 分配员工改成多选 zhou keda 2024-06-19 16:29:44 +08:00
• 7c3e39e104 贴标喷码参数修改 zhou keda 2024-06-19 15:43:30 +08:00
• f4b40f22cc 注塑定点配送过滤待下发的 zhou keda 2024-06-19 14:21:07 +08:00
• 3d217c8adf 称重完成信号改成1次 zhou keda 2024-06-19 10:42:58 +08:00
• 8957dd9628 生产工单分配员工 zhou keda 2024-06-18 16:54:30 +08:00
• a30bcf213d bug、提示信息完善 majian 2024-06-18 09:01:28 +08:00
• a945d5db15 bug zhou keda 2024-06-17 14:42:06 +08:00
• 97ccf2c082 bug zhou keda 2024-06-17 14:38:38 +08:00
• 63525ddae1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-14 17:07:07 +08:00
• 71e83874bf bug majian 2024-06-14 17:06:57 +08:00
• c0d05ef133 批次调整 zhou keda 2024-06-14 11:51:37 +08:00
• ab0b4bedf4 喷码贴标新增批号 zhou keda 2024-06-14 09:28:52 +08:00
• 726aea8912 erp生产工单同步接口 zhou keda 2024-06-13 17:19:24 +08:00
• c5a7e672b6 物料规格型号改成material_specification字段 zhou keda 2024-06-13 17:18:38 +08:00
• c368e24d9e 注塑定点配送换成左右轮着来 zhou keda 2024-06-13 14:39:52 +08:00
• 5721d85013 生产提报日志优化 zhou keda 2024-06-13 10:36:06 +08:00