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

Commit Graph

  • 182eb83090 暂时屏蔽24数据 mgw 2024-10-18 10:17:22 +08:00
  • 67a607b053 增加设备oee处获取数据的定时器 mgw 2024-10-18 10:05:55 +08:00
  • 00a04af94f 加工精度 guanhuan 2024-10-18 09:30:20 +08:00
  • 33d23c28b1 Accept Merge Request #1421: (feature/工单状态优化 -> develop) 禹翔辉 2024-10-18 09:21:43 +08:00
  • 571fb29482 Merge branch 'feature/用刀校验优化' into feature/工单状态优化 yuxianghui 2024-10-18 09:14:39 +08:00
  • 1dae20e055 处理制造订单、工单的状态计算方法没有触发的问题 yuxianghui 2024-10-18 09:13:34 +08:00
  • 6be9d44572 Merge remote-tracking branch 'origin/develop' into feature/临时分支 hujiaying 2024-10-18 08:40:57 +08:00
  • 8a459e7e90 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-10-17 17:54:59 +08:00
  • 4c486e53aa 设备oee界面数据准备 mgw 2024-10-17 17:54:32 +08:00
  • 19509a3ce2 1 yuxianghui 2024-10-17 17:54:08 +08:00
  • 4d424e90d3 Accept Merge Request #1420: (feature/临时分支 -> develop) 胡嘉莹 2024-10-17 17:49:26 +08:00
  • 9bbf613bcb 修改生成完工入库提醒，订单发货提醒跳转到表单详情 hujiaying 2024-10-17 17:39:43 +08:00
  • cc40d479a9 加工精度同步 guanhuan 2024-10-17 17:20:51 +08:00
  • f5ea0ec153 Accept Merge Request #1419: (feature/用刀校验优化 -> develop) 禹翔辉 2024-10-17 17:04:12 +08:00
  • ea6c0f7d0b Merge branch 'feature/程序用刀校验优化' into feature/用刀校验优化 yuxianghui 2024-10-17 17:02:17 +08:00
  • 763009a3c0 1、优化手动返工时，cnc用刀校验逻辑 yuxianghui 2024-10-17 17:01:20 +08:00
  • cf34ac5bbc 辅助文件上传 guanhuan 2024-10-17 16:31:13 +08:00
  • 0faedd35d7 Accept Merge Request #1418: (feature/程序用刀校验优化 -> develop) 禹翔辉 2024-10-17 16:01:42 +08:00
  • 135b97d4f8 1 yuxianghui 2024-10-17 16:00:44 +08:00
  • 61f3aff768 Merge branch 'feature/制造订单状态优化_3' into feature/程序用刀校验优化 yuxianghui 2024-10-17 15:52:06 +08:00
  • 9e369f0150 修改调用创建cam程序用刀计划方法的判断条件 yuxianghui 2024-10-17 15:51:00 +08:00
  • 16d50f5bf2 Accept Merge Request #1417: (feature/工作中心添加质检权限 -> develop) 杨金灵 2024-10-17 15:40:23 +08:00
  • 80f0454996 工作中心添加质检权限 jinling.yang 2024-10-17 15:37:08 +08:00
  • 9b9d811594 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-17 15:33:51 +08:00
  • 008ae20329 Merge branch 'feature/检测结果添加质检权限' into develop jinling.yang 2024-10-17 15:33:29 +08:00
  • 80b3b4b0f7 Accept Merge Request #1416: (feature/检测结果添加质检权限 -> develop) 杨金灵 2024-10-17 15:26:29 +08:00
  • d64b480496 检测结果添加质检权限 jinling.yang 2024-10-17 15:25:13 +08:00
  • 854ec8da4e Accept Merge Request #1415: (feature/制造订单状态优化_3 -> develop) 禹翔辉 2024-10-17 14:43:48 +08:00
  • d25b871854 1 yuxianghui 2024-10-17 14:42:35 +08:00
  • 37aafe7b30 Accept Merge Request #1414: (feature/制造订单状态优化_3 -> develop) 禹翔辉 2024-10-17 14:29:32 +08:00
  • 26910f7b15 Merge branch 'feature/制造订单状态优化_2' into feature/制造订单状态优化_3 yuxianghui 2024-10-17 14:25:05 +08:00
  • 3ea2acd46e Accept Merge Request #1413: (feature/修复工单定时器 -> develop) 杨金灵 2024-10-17 14:23:36 +08:00
  • 303462ba9c Merge branch 'feature/制造订单状态优化_1' into feature/制造订单状态优化_2 yuxianghui 2024-10-17 14:22:59 +08:00
  • 53fad50af6 修复工单定时器 jinling.yang 2024-10-17 14:22:43 +08:00
  • 1245323b9d 1、优化手动获取编程的接口，添加获取编程完成之后进行用刀校验；2、处理 权限问题-工单详情缺少【时间跟踪】tab；3、用刀校验方法添加日志 yuxianghui 2024-10-17 14:22:09 +08:00
  • 4d8e86cff3 Accept Merge Request #1412: (feature/还原代码 -> develop) 杨金灵 2024-10-17 14:08:18 +08:00
  • 7bc7d2059c 还原代码 jinling.yang 2024-10-17 14:06:16 +08:00
  • f9c209e85c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-17 13:47:40 +08:00
  • 6ae783387c Merge branch 'feature/修复加工质检' into develop jinling.yang 2024-10-17 13:47:18 +08:00
  • 7c0202afc6 Accept Merge Request #1411: (feature/修复加工质检 -> develop) 杨金灵 2024-10-17 13:47:00 +08:00
  • 9ad582612b 还原注释代码 jinling.yang 2024-10-17 13:43:43 +08:00
  • d1db917432 修复加工质检 jinling.yang 2024-10-17 11:58:54 +08:00
  • 847293385d Accept Merge Request #1410: (feature/还原代码 -> develop) 杨金灵 2024-10-17 11:34:40 +08:00
  • 4e8eccfd0b 还原代码 jinling.yang 2024-10-17 11:33:20 +08:00
  • 5cb5306471 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-17 11:19:28 +08:00
  • 9a5b45b969 Merge branch 'feature/加工质检添加权限' into develop jinling.yang 2024-10-17 11:19:04 +08:00
  • 7c82bbf3da Accept Merge Request #1409: (feature/加工质检添加权限 -> develop) 杨金灵 2024-10-17 11:18:39 +08:00
  • 9177acf277 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/加工质检添加权限 jinling.yang 2024-10-17 11:03:08 +08:00
  • 93187d7f4a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-17 11:01:57 +08:00
  • 94b1551de2 加工质检添加权限 jinling.yang 2024-10-17 11:01:42 +08:00
  • 1c713d3278 Accept Merge Request #1408: (feature/制造功能优化 -> develop) 马广威 2024-10-17 10:26:36 +08:00
  • bdef93fca3 Accept Merge Request #1407: (feature/制造订单状态优化_1 -> develop) 禹翔辉 2024-10-17 10:17:02 +08:00
  • e9e55c72b9 Merge branch 'feature/制造订单状态优化' into feature/制造订单状态优化_1 yuxianghui 2024-10-17 10:15:23 +08:00
  • 919450aafb 优化制造订单无效刀自动编程方法 yuxianghui 2024-10-17 10:13:54 +08:00
  • 78f486ad7c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-17 10:12:36 +08:00
  • ccdfcb5e50 Merge branch 'feature/优化加工质检' into develop jinling.yang 2024-10-17 10:12:20 +08:00
  • 9b275536e9 Accept Merge Request #1406: (feature/优化加工质检 -> develop) 杨金灵 2024-10-17 10:10:51 +08:00
  • bf39ed10b4 还原代码 jinling.yang 2024-10-17 10:03:45 +08:00
  • 0e8bda3369 修复加工质检 jinling.yang 2024-10-17 09:58:24 +08:00
  • 87bb22857a 修改维护翻译为设备 mgw 2024-10-17 09:19:47 +08:00
  • 9cd8d9d823 修复验证 jinling.yang 2024-10-16 17:59:34 +08:00
  • 931732f75e Accept Merge Request #1405: (feature/制造功能优化 -> develop) 马广威 2024-10-16 17:33:34 +08:00
  • 35ace3b3eb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-10-16 17:29:41 +08:00
  • 4b4601ae85 CNC自动生产线生产业绩看板优化需求 mgw 2024-10-16 17:29:25 +08:00
  • 46337855a4 Accept Merge Request #1404: (feature/制造订单状态优化 -> develop) 禹翔辉 2024-10-16 17:04:00 +08:00
  • 43f8aec70a Merge branch 'feature/刀具页面存档权限设置' into feature/制造订单状态优化 yuxianghui 2024-10-16 17:02:18 +08:00
  • a21b4302d4 1、处理 因为权限导致的功能刀具安全库存列表点击任意数据报错； 2、处理 下发程序校验刀具有无效刀时制造订单状态不对问题 yuxianghui 2024-10-16 17:01:15 +08:00
  • 4adc3b700a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单定时器修复时区问题 jinling.yang 2024-10-16 15:32:47 +08:00
  • 42b5a32708 Accept Merge Request #1403: (feature/工单定时器修复时区问题 -> develop) 杨金灵 2024-10-16 15:00:58 +08:00
  • 296e30e5fd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-16 14:59:16 +08:00
  • 90718cc989 Merge branch 'feature/修复工单write方法' into develop jinling.yang 2024-10-16 14:53:37 +08:00
  • 857930e169 Accept Merge Request #1402: (feature/修复工单write方法 -> develop) 杨金灵 2024-10-16 14:50:14 +08:00
  • 9b1b6e2b72 修复工单修改方法 jinling.yang 2024-10-16 14:49:54 +08:00
  • 37217b0dd9 修复工单write方法 jinling.yang 2024-10-16 14:46:31 +08:00
  • f138eab47a Accept Merge Request #1401: (feature/下发编程单接口添加输出 -> develop) 杨金灵 2024-10-16 14:16:54 +08:00
  • 4e4c53927b 下发编程单接口添加输出 jinling.yang 2024-10-16 14:15:37 +08:00
  • fab1d77d64 还原注释代码 jinling.yang 2024-10-16 14:07:35 +08:00
  • f4f7087465 添加2D图纸和质量标准2个字段 jinling.yang 2024-10-16 14:06:18 +08:00
  • 020da1d510 Merge branch 'feature/auxiliary_files_upload' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化加工质检 jinling.yang 2024-10-16 11:49:37 +08:00
  • 2956f13ee7 优化加工质检 jinling.yang 2024-10-16 11:49:05 +08:00
  • 939f3d58f4 产品新增2D加工图纸,质检标准 guanhuan 2024-10-16 11:41:15 +08:00
  • 3d85b7863c Accept Merge Request #1400: (feature/workorder_exceptions -> develop) 胡尧 2024-10-16 10:23:19 +08:00
  • 54abb7a9f7 增加备注 胡尧 2024-10-16 10:22:30 +08:00
  • 9ca9b337ef 解决sf_quality报错问题，增加单元测试 胡尧 2024-10-16 10:19:41 +08:00
  • 92c4bcb049 解决冲突 胡尧 2024-10-15 15:25:31 +08:00
  • ce5cb17e31 工单异常处理 胡尧 2024-10-15 15:14:16 +08:00
  • 6330929c04 Accept Merge Request #1399: (feature/优化质检生产仓看板 -> develop) 杨金灵 2024-10-15 11:56:14 +08:00
  • 79a753b609 优化质检生产仓看板 jinling.yang 2024-10-15 11:55:10 +08:00
  • 30ebc62697 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-15 09:30:58 +08:00
  • 28b218a13b Merge branch 'feature/销售订单和工单逾期消息推送' into develop jinling.yang 2024-10-15 09:30:25 +08:00
  • cd24430ea9 Accept Merge Request #1398: (feature/销售订单和工单逾期消息推送 -> develop) 杨金灵 2024-10-15 09:30:08 +08:00
  • f4daf94f7b 还原代码 jinling.yang 2024-10-15 09:29:23 +08:00
  • 4acce194d9 Merge branch 'feature/销售订单和工单逾期消息推送' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单和工单逾期消息推送 jinling.yang 2024-10-15 09:27:16 +08:00
  • 761e8d4579 还原代码 jinling.yang 2024-10-15 09:26:55 +08:00
  • 284c66ad86 Merge branch refs/heads/develop into refs/heads/feature/销售订单和工单逾期消息推送 杨金灵 2024-10-15 09:17:21 +08:00
  • 6c7c10924a 还原注释代码 jinling.yang 2024-10-15 09:07:11 +08:00
  • 8f2d5129b1 还原代码 jinling.yang 2024-10-15 09:06:13 +08:00
  • 2a067778bc 优化质量检测(加工检测)及消息推送 jinling.yang 2024-10-14 17:53:38 +08:00
  • 299cc2f12f Accept Merge Request #1397: (feature/刀具页面存档权限设置 -> develop) 禹翔辉 2024-10-14 16:04:41 +08:00
  • ce705abd20 刀具页面存档权限设置为只有超级管理员才能存档 yuxianghui 2024-10-14 16:03:21 +08:00