Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 6e3bda642a bug zhou keda 2024-07-19 08:50:02 +08:00
• d9f53c2024 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-18 23:54:54 +08:00
• 9912976239 随料架更新料箱位置，下任务顺序变更 majian 2024-07-18 23:54:39 +08:00
• 9326b55a8e 同步单位 zhou keda 2024-07-18 14:05:49 +08:00
• fd8806b204 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-18 12:33:38 +08:00
• 5666f0262e 转库单同步调整 库存报表调整 majian 2024-07-18 12:31:05 +08:00
• 5bbd7eb25f bug zhou keda 2024-07-18 12:04:52 +08:00
• 7f7f21c271 静置仓到成品 majian 2024-07-18 10:29:56 +08:00
• 1374ba7a56 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-18 10:29:11 +08:00
• d8a9562ffa 添加其他数据库 zhou keda 2024-07-18 08:40:24 +08:00
• 019651b023 电梯下发逻辑变更 majian 2024-07-17 22:50:24 +08:00
• e16a2dfe37 bug zhou keda 2024-07-17 17:22:31 +08:00
• c6ae917bc9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-17 14:58:41 +08:00
• b6d3588335 1 majian 2024-07-17 14:58:35 +08:00
• 757bdf8cb9 注塑定点配送修改 zhou keda 2024-07-17 14:12:52 +08:00
• 251acac591 回滚上个提交 zhou keda 2024-07-17 14:12:22 +08:00
• 44d586e85b 注塑定点配送修改 zhou keda 2024-07-17 14:10:31 +08:00
• 96875e8afc bug zhou keda 2024-07-17 12:07:27 +08:00
• 03775c8a12 静置仓逻辑编写，返回提示修改 bug，包材出库逻辑变更 majian 2024-07-17 11:23:23 +08:00
• ff038ff1d5 组装提报仓库 库位修改 zhou keda 2024-07-17 09:32:56 +08:00
• 73e496b989 bug zhou keda 2024-07-16 17:26:49 +08:00
• bf39c08837 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-16 12:45:43 +08:00
• bfc22c7326 灭菌线、信号变更 majian 2024-07-16 12:45:35 +08:00
• 97045e3bbe bug zhou keda 2024-07-16 12:37:34 +08:00
• a66d0c0a9a ... zhou keda 2024-07-16 10:11:26 +08:00
• 1f5dfa5a2e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-16 09:37:48 +08:00
• 41bb4584cc 输送线信号变更 majian 2024-07-16 09:37:37 +08:00
• ae17e639eb Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-07-16 09:21:25 +08:00
• 25b0c4e78d bug zhou keda 2024-07-16 09:21:16 +08:00
• 009f9b2911 优化 majian 2024-07-15 23:34:42 +08:00
• a3532f00f9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-15 18:06:41 +08:00
• 56f8531044 待灭菌仓流程，erp采购订单接口，日志完善 majian 2024-07-15 18:06:26 +08:00
• 3d07942f32 其他入库 zhou keda 2024-07-15 17:32:34 +08:00
• 71b3cfba94 日志 zhou keda 2024-07-15 14:38:19 +08:00
• c17bf876c1 erp 其他出库接口 zhou keda 2024-07-15 14:26:05 +08:00
• 53384c7be5 人工入空托 majian 2024-07-13 23:10:31 +08:00
• 724372b20a 人工空托盘入库 majian 2024-07-13 22:52:14 +08:00
• 2dc8f04e4e 二楼流程优化 电梯bug修复 majian 2024-07-13 22:08:30 +08:00
• 7d31cf037c 配置变更 majian 2024-07-12 15:14:10 +08:00
• 692e75de19 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-12 15:12:00 +08:00
• f4cf422a83 电梯控制bug处理 包材出库逻辑变更 majian 2024-07-12 15:11:11 +08:00
• 6c533477a7 用户导入 zhou keda 2024-07-12 15:01:12 +08:00
• 22a576c63f 更换员工 zhou keda 2024-07-11 16:27:21 +08:00
• 1109df5cdd Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-07-11 15:20:59 +08:00
• 22f255f85e 第三方接口请求记录 zhou keda 2024-07-11 15:20:45 +08:00
• a75fc548cb 同步bip调整 majian 2024-07-11 14:42:10 +08:00
• 614681284d 包材入库 包材出库 PDA空载具出库bug、其它bug处理 majian 2024-07-10 23:01:33 +08:00
• f48a82adb4 转库单接口增加是否要子表字段 zhou keda 2024-07-10 16:46:50 +08:00
• 3de4f9b520 api接口加上默认域名 zhou keda 2024-07-10 13:53:24 +08:00
• 7a50a74c70 接口预览字段返回修改 zhou keda 2024-07-10 10:49:37 +08:00
• 3b660e1238 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-09 14:07:21 +08:00
• d39859c105 库存报表，日志完善 majian 2024-07-09 14:06:59 +08:00
• 6262a94edc 物料签收bug zhou keda 2024-07-08 17:41:30 +08:00
• d333b62dfa bug zhou keda 2024-07-08 12:02:48 +08:00
• c2aaa1e353 投料验证生产bom zhou keda 2024-07-08 08:34:18 +08:00
• a281ce82c6 查找报错sql zhou keda 2024-07-05 17:23:04 +08:00
• 781e2cad92 bug zhou keda 2024-07-05 17:20:48 +08:00
• 080409c749 Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-07-05 15:17:25 +08:00
• 9d625784e6 视图 bug zhou keda 2024-07-05 15:17:17 +08:00
• e005082c12 erp转库单同步 majian 2024-07-05 14:03:21 +08:00
• f35e9f3815 bug zhou keda 2024-07-05 09:59:17 +08:00
• 11b8fed5b4 bug zhou keda 2024-07-05 09:31:05 +08:00
• eea9482c52 bug zhou keda 2024-07-05 09:28:02 +08:00
• 2d9705e763 Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-07-04 16:53:36 +08:00
• 3d0156d880 bug zhou keda 2024-07-04 16:52:58 +08:00
• c5fc62d3ce Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-04 16:34:11 +08:00
• 9ea9b4378d erp转库单的同步，签收逻辑修改 majian 2024-07-04 16:34:04 +08:00
• f635d5542e bug zhou keda 2024-07-04 16:13:08 +08:00
• 7d9abfd6c8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-04 14:55:20 +08:00
• db4cc5ff8a 生产提报最后写入plc zhou keda 2024-07-04 14:50:03 +08:00
• 077b08efbe Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-04 10:54:05 +08:00
• cbe419274e erp转库单同步 majian 2024-07-04 10:53:58 +08:00
• 02edc26ffe bug zhou keda 2024-07-04 10:52:48 +08:00
• 7b35c1768e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-04 10:00:54 +08:00
• b380864d40 bug zhou keda 2024-07-04 09:59:36 +08:00
• a368e4ffe2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-04 09:48:11 +08:00
• 397c2b2eae 日志优化 zhou keda 2024-07-04 09:40:55 +08:00
• fa4fdb9d0c 生产提报加锁 zhou keda 2024-07-04 09:22:17 +08:00
• 785f0f287a 1 zhou keda 2024-07-03 17:52:37 +08:00
• 694412e965 优化日志 zhou keda 2024-07-03 17:51:58 +08:00
• 1b564293d1 二楼细节完善 bug处理 majian 2024-07-03 17:06:02 +08:00
• 7fa009d599 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-03 17:04:57 +08:00
• 0465c4f73d 1 zhou keda 2024-07-03 17:04:39 +08:00
• 2da3feb5e4 erp生产工单 zhou keda 2024-07-03 17:02:05 +08:00
• 11490d101f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-03 11:50:30 +08:00
• d2f3a7aff7 bug zhou keda 2024-07-03 11:46:17 +08:00
• 23a63c8737 删除多余表 zhou keda 2024-07-02 15:13:53 +08:00
• db213c6050 删除多余表 zhou keda 2024-07-02 13:53:32 +08:00
• 3f398584fc Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-07-01 17:45:48 +08:00
• 8c66d5c45c 一楼中储仓下发二楼出库策略优化，bug majian 2024-07-01 17:45:36 +08:00
• e4fc54c9a5 bug zhou keda 2024-07-01 17:19:17 +08:00
• fd42810269 bug zhou keda 2024-07-01 14:55:00 +08:00
• 46f7b4bf20 长管投料不解绑父载具 zhou keda 2024-07-01 11:19:08 +08:00
• 52f200d555 Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-06-29 16:42:25 +08:00
• c0a1efb77c bug zhou keda 2024-06-29 16:42:15 +08:00
• d54656bc03 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-29 16:18:16 +08:00
• 4fb28a1fe3 生产提报日志优化 zhou keda 2024-06-29 16:16:55 +08:00
• fb2d15f4b9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-06-29 15:59:00 +08:00
• d05b6a596c bug zhou keda 2024-06-29 15:58:30 +08:00
• 2577ebc090 退料判断物料种类 majian 2024-06-29 15:58:27 +08:00