jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 7fee98cdee 修复报废 jinling.yang 2024-08-23 16:13:03 +08:00
  • 4b7c277a25 Accept Merge Request #1242: (feature/优化制造功能 -> develop) 马广威 2024-08-23 12:05:03 +08:00
  • 064397b32b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-23 12:04:03 +08:00
  • 048155bc9c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-23 12:03:48 +08:00
  • d439c9140d Accept Merge Request #1241: (feature/优化制造功能 -> develop) 马广威 2024-08-23 11:44:51 +08:00
  • 296659ebb0 增加异常明细 mgw 2024-08-23 11:44:05 +08:00
  • a82063d078 Accept Merge Request #1233: (feature/优化制造功能 -> develop) 马广威 2024-08-23 10:07:41 +08:00
  • f17ff2bc57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-23 10:05:30 +08:00
  • 5df3de7dcd 增加返工数量等 mgw 2024-08-23 10:05:17 +08:00
  • b37738fbc3 Accept Merge Request #1240: (feature/agv_dispatch -> develop) 胡尧 2024-08-22 15:57:49 +08:00
  • 79f3dce0ec 屏蔽下发agv小车任务 胡尧 2024-08-22 15:57:17 +08:00
  • 4b87ea3f0e Accept Merge Request #1239: (feature/agv_dispatch -> develop) 胡尧 2024-08-22 15:43:01 +08:00
  • 098ac0e7e9 修改下发agv任务逻辑 胡尧 2024-08-22 15:42:34 +08:00
  • 6825364a2b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-22 11:33:53 +08:00
  • 0cac8fbb4f Merge branch 'feature/修复报废-拣货单（sfp）' into develop jinling.yang 2024-08-22 10:55:12 +08:00
  • dce748c6a7 Accept Merge Request #1238: (feature/修复报废-拣货单（sfp） -> develop) 杨金灵 2024-08-22 10:54:59 +08:00
  • 536c766272 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废-拣货单（sfp） jinling.yang 2024-08-22 10:52:38 +08:00
  • 422edbcb02 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-22 10:52:28 +08:00
  • d13961ff5f 修复报废-拣货单（sfp） jinling.yang 2024-08-22 10:52:19 +08:00
  • b603934637 Accept Merge Request #1237: (feature/线边料架接口优化 -> develop) 禹翔辉 2024-08-22 10:36:34 +08:00
  • 62d303168e Merge branch 'feature/销售、刀具模块优化_1' into feature/线边料架接口优化 yuxianghui 2024-08-22 10:32:47 +08:00
  • 39bc206344 1、优化货位信息接口、库位变更接口。 yuxianghui 2024-08-22 10:31:22 +08:00
  • 715d835633 Accept Merge Request #1236: (feature/agv_dispatch -> develop) 胡尧 2024-08-22 10:23:52 +08:00
  • 9e356682dc 修改接驳站状态接口 胡尧 2024-08-22 10:22:35 +08:00
  • 5dc392a27b Accept Merge Request #1235: (feature/agv_dispatch -> develop) 胡尧 2024-08-21 20:19:13 +08:00
  • 3d2c62f5db 修复配送完成修改工件配送单的bug 胡尧 2024-08-21 20:16:41 +08:00
  • 1e3f0d5ee5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-21 17:44:37 +08:00
  • b26919a40d 优化接口，使其易于取值 mgw 2024-08-21 17:44:22 +08:00
  • 9ffe338532 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-21 17:00:01 +08:00
  • 08d333e4e2 Merge branch 'feature/修复报废-工单状态' into develop jinling.yang 2024-08-21 16:59:29 +08:00
  • 47c501c6c6 Accept Merge Request #1234: (feature/修复报废-工单状态 -> develop) 杨金灵 2024-08-21 16:59:13 +08:00
  • 335c79e618 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-21 16:54:11 +08:00
  • ba986995ed 修复报废-工单状态 jinling.yang 2024-08-21 16:53:32 +08:00
  • 2a45cdd53a Accept Merge Request #1232: (feature/agv_dispatch -> develop) 马广威 2024-08-21 16:25:05 +08:00
  • 0cdf37bb50 修改接口名字 胡尧 2024-08-21 16:20:45 +08:00
  • bae2592587 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-21 15:38:21 +08:00
  • c86cc27510 增加工单相关接口 mgw 2024-08-21 15:38:05 +08:00
  • 2dded43e39 Accept Merge Request #1231: (feature/agv_dispatch -> develop) 胡尧 2024-08-21 15:10:07 +08:00
  • eb6e638018 开启agv任务下发代码 胡尧 2024-08-21 15:06:06 +08:00
  • f64c21dacd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-21 14:50:12 +08:00
  • 426aa78ed4 Merge branch 'feature/修复报废bug' into develop jinling.yang 2024-08-21 14:49:59 +08:00
  • 42c65496ff Accept Merge Request #1230: (feature/修复报废bug -> develop) 杨金灵 2024-08-21 14:47:23 +08:00
  • e893abd83e 还原接口代码 jinling.yang 2024-08-21 14:46:37 +08:00
  • 78e2e7184e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废bug jinling.yang 2024-08-21 14:43:44 +08:00
  • ce575adc88 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-21 14:43:33 +08:00
  • 6668e0ee2f 还原OCC代码 jinling.yang 2024-08-21 14:43:22 +08:00
  • 647d21dea3 Accept Merge Request #1229: (feature/agv_dispatch -> develop) 胡尧 2024-08-21 11:32:50 +08:00
  • 0e13e2190e 屏蔽agv任务下发代码 胡尧 2024-08-21 11:31:09 +08:00
  • 7f3d50a130 开启agv小车任务下发代码 胡尧 2024-08-21 10:03:03 +08:00
  • 7b2908defa 修复报废bug jinling.yang 2024-08-20 17:52:36 +08:00
  • a8211171b0 增加以日、月、年为日期期间的序列，工件配送单状态同步，返工时不生成工件配送单 胡尧 2024-08-20 16:18:47 +08:00
  • c57daa2c52 1、处理销售订单确认接单后，确认接单、取消按钮没有隐藏问题 yuxianghui 2024-08-20 16:13:30 +08:00
  • 4ed7ecf628 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-20 14:45:39 +08:00
  • 8a6ebb331a Merge branch 'feature/优化最新版报废' into develop jinling.yang 2024-08-20 14:39:21 +08:00
  • b333e27c51 Accept Merge Request #1228: (feature/优化最新版报废 -> develop) 杨金灵 2024-08-20 14:39:03 +08:00
  • 6761851407 还原代码 jinling.yang 2024-08-20 14:38:42 +08:00
  • ada7936d1b Accept Merge Request #1227: (feature/agv_dispatch -> develop) 胡尧 2024-08-20 14:36:43 +08:00
  • 9c40aa9a7e 修复更新agv站点同时下发任务的bug 胡尧 2024-08-20 14:36:02 +08:00
  • 0694541653 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-20 14:34:34 +08:00
  • e4e2dca22c 还原注释代码 jinling.yang 2024-08-20 14:34:25 +08:00
  • e259fd0c05 优化报废 jinling.yang 2024-08-20 14:30:42 +08:00
  • a767c6491f 增加移除焦点的controller 胡尧 2024-08-20 14:05:05 +08:00
  • 6c2045d0c3 Accept Merge Request #1222: (feature/优化制造功能 -> develop) 马广威 2024-08-20 11:28:33 +08:00
  • 6fe56605ab Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-20 11:27:34 +08:00
  • bf2c7fd3c5 增加解绑托盘功能 mgw 2024-08-20 11:27:18 +08:00
  • 54fc91baa2 去掉js中的日志 胡尧 2024-08-20 10:50:55 +08:00
  • 376f2b3079 Accept Merge Request #1226: (feature/前端样式修改 -> develop) 黄焱 2024-08-20 10:50:39 +08:00
  • 3c50f19e2d 保存、取消按钮增加文字提示 hy 2024-08-20 10:48:42 +08:00
  • 08622b10b9 Accept Merge Request #1225: (feature/agv_dispatch -> develop) 胡尧 2024-08-20 10:48:35 +08:00
  • dc5b68cca0 生产总监、机床操作岗增加agv调度菜单权限，AGV下发任务界面需二次确认 胡尧 2024-08-20 10:45:31 +08:00
  • 1d399527e0 增加装夹预调工单扫码开启 mgw 2024-08-20 10:42:36 +08:00
  • b3bfa69656 Accept Merge Request #1224: (feature/销售、刀具模块优化_1 -> develop) 禹翔辉 2024-08-20 09:05:57 +08:00
  • 96e226836e Merge branch 'feature/销售、刀具模块优化' into feature/销售、刀具模块优化_1 yuxianghui 2024-08-20 09:02:52 +08:00
  • 062ca66328 1、库位变更接口、库位信息接口优化；2、功能刀具模型from页面按钮样式及显示优化； yuxianghui 2024-08-19 17:29:09 +08:00
  • 7ab8269088 Accept Merge Request #1223: (feature/agv_dispatch -> develop) 胡尧 2024-08-19 14:40:04 +08:00
  • 1241737dea 修改agv调度搜索条件 胡尧 2024-08-19 14:37:55 +08:00
  • 813e424ec9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-19 14:25:43 +08:00
  • 8c08893aa1 修复“制造订单详情多了一个没有文案的按钮” mgw 2024-08-19 14:25:26 +08:00
  • 5ad35de76b 修复agv调度bug 胡尧 2024-08-19 11:22:30 +08:00
  • 3c8dac799d 修复报废 jinling.yang 2024-08-16 17:28:21 +08:00
  • 29c1c7a54d 调整日志顺序;增加订单名返回 mgw 2024-08-16 17:19:54 +08:00
  • 2c27a9b575 Accept Merge Request #1221: (feature/agv_dispatch -> develop) 胡尧 2024-08-16 17:13:46 +08:00
  • 0e4b9e44f8 修改下发agv调度任务参数 胡尧 2024-08-16 17:12:34 +08:00
  • a07a1ba268 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-16 16:57:47 +08:00
  • f537fbc597 运行日志数据接入 mgw 2024-08-16 16:57:32 +08:00
  • a6b7167f3b 修改创建调度任务逻辑，不匹配的路线返回错误信息 胡尧 2024-08-16 16:49:30 +08:00
  • c4de966dea 装夹工单完成后生成工件配送单同时绑定rfid 胡尧 2024-08-16 16:31:54 +08:00
  • 03cfc00be5 Merge branch 'feature/销售单优化' into feature/销售、刀具模块优化 yuxianghui 2024-08-16 16:02:19 +08:00
  • cc05e8423e 1、注释重写的销售单交货按钮代码 yuxianghui 2024-08-16 16:01:24 +08:00
  • e78516f73c 1、 完成 功能刀具组装和拆解页面扫描操作优化需求 yuxianghui 2024-08-16 15:59:24 +08:00
  • a277bb402e Accept Merge Request #1220: (feature/agv_dispatch -> develop) 胡尧 2024-08-16 15:24:27 +08:00
  • e5793638f7 屏蔽开始装夹预调绑定rfid时，不绑定工件配送的rfid 胡尧 2024-08-16 15:21:08 +08:00
  • 9673fd165d Accept Merge Request #1219: (feature/agv_dispatch -> develop) 胡尧 2024-08-16 10:41:30 +08:00
  • e92905fe32 修改agv小车相关接口 胡尧 2024-08-16 10:36:01 +08:00
  • 1b521ae460 解决冲突 胡尧 2024-08-16 09:50:31 +08:00
  • 4e0d8f1c88 修改AGV调度 胡尧 2024-08-16 09:43:03 +08:00
  • aecf2121a1 agv调度开发 胡尧 2024-08-15 17:41:25 +08:00
  • e2d7576a5e 优化报废 jinling.yang 2024-08-15 17:31:37 +08:00
  • cc13e5cd9a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-15 17:14:40 +08:00
  • 271f34a03b 增加开动率采集 mgw 2024-08-15 17:14:07 +08:00