Commit Graph

Select branches

Hide Pull Requests

develop

feature/10月迭代优化

feature/20250604_chenye

feature/6679

feature/6684

feature/6686

feature/6694

feature/6711

feature/6763

feature/6973

feature/7119_lxbTest

feature/7134

feature/7141

feature/7151

feature/7154

feature/7229

feature/7230

feature/7231

feature/7248

feature/7249

feature/7253

feature/7254

feature/7254_new

feature/7277

feature/7277_7280

feature/7280

feature/auxiliary_files_upload

feature/backup-develop

feature/commercially_launched

feature/customer_material_optimization

feature/customer_supply

feature/delivery_status

feature/machining_accuracy_sync

feature/manufactur_order

feature/merge-6694

feature/message_update

feature/model_type_update

feature/mrp_bug_fixed

feature/new

feature/new1

feature/new111

feature/org_info_synchronous

feature/part_number

feature/plan_slow

feature/pre-three-elment

feature/process_outsourcing_code_stripping

feature/sale_order_route_pick

feature/sf-master1.0

feature/sf看板样式统一

feature/sync-develop-with-master

feature/tax_sync

feature/tool_standard_library_process

feature/update_process_start_time

feature/update_production_line

feature/wechat_message

feature/weid_sync_update

feature/workorder_exceptions

feature/临时分支

feature/主题logo添加中文

feature/产品的权限优化

feature/仓库发货下发bfm

feature/优化工件配送及AGV

feature/优化报废和返工

feature/优化设备维保标准

feature/优化调拨列表

feature/修改产品名称

feature/修改制造订单列表显示

feature/修改机床参数bug

feature/修改网站标题

feature/制造功能优化

feature/前端样式修改

feature/加工能力显示重叠

feature/取消加工订单

feature/合同审批

feature/坯料尺寸显示修改

feature/增加模块完整性验证

feature/增加质检模块

feature/增加适配开发环境

feature/工单返工优化

feature/打印配置优化

feature/报废优化

feature/搜索优化

feature/新增plm模块

feature/新增坯料类型

feature/新增消息提醒

feature/根据项目组区分sf代码

feature/消息提醒优化

feature/物料需求计划管理

feature/禁止负库存

feature/程序用刀异常提醒

feature/请购明细

feature/调拨单质检

feature/还原产品页面代码

feature/逾期工单批量重新安排

feature/采购申请优化

feature/销售和排程添加消息推送

feature/零件图号名称优化需求

feature/零件图号筛选

feature/需求计划

feature/页面显示优化

feature/验证合并的逻辑

feature/齐套检查与下达生产

hotfix/修复刀具预警没有预警记录和通知

hotfix/修复多面加工产线状态

hotfix/修复工件上下产线接口

hotfix/修复报废-外协入库验证

hotfix/修改agv回调接口授权

hotfix/备注为空

hotfix/解决采购申请bug

master

release/release1.0

release/release1.6

release/release1.7

release/release_1.2

release/release_1.4

release/release_1.5

release/release_1.8

release/release_1.9

release/release_2.0

release/release_2.1

release/release_2.10

release/release_2.11

release/release_2.12

release/release_2.13

release/release_2.14

release/release_2.15

release/release_2.2

release/release_2.3

release/release_2.4

release/release_2.5

release/release_2.6

release/release_2.7

release/release_2.8

release/release_2.9

master_sf_20240518_1.0

master_sf_20240529_1.1

master_sf_20240530_1.2

master_sf_20240604_1.3

master_sf_20240605_1.4

master_sf_20240613_1.5

master_sf_20240617_1.6

master_sf_20240619_1.7

master_sf_20240624_1.8

master_sf_20240701_1.9

master_sf_20240703_2.0

master_sf_20240724_2.1

master_sf_20240724_2.2

master_sf_20240724_2.3

master_sf_20240830_2.4

master_sf_20241011_2.5

master_sf_20241104_2.6

master_sf_20241208_2.7

master_sf_20250107_2.8

master_sf_20250121_2.9

master_sf_20250304_2.10

master_sf_20250401_2.11

master_sf_20250415_2.12

master_sf_20250428_2.13

master_sf_20250509_2.14

master_sf_20250610_2.15

master_sf_20250701_2.16

release_1.3

release_1_1

修复工件上下产线

修复编程单下发接口

Mono Color

• e1d6726d8b 修改库区信息方法 qihao.gong@jikimo.com 2024-02-23 16:41:09 +08:00
• dcd0f5f892 Accept Merge Request #847: (feature/修复质检接口 -> develop) 杨金灵 2024-02-23 16:33:21 +08:00
• 40fdc1f804 Accept Merge Request #846: (feature/修改机床参数bug -> develop) 龚启豪 2024-02-23 16:33:19 +08:00
• 33e88eb9cc 修复质检接口 jinling.yang 2024-02-23 16:31:56 +08:00
• 8b8c8ebd26 修改获取库区接口 qihao.gong@jikimo.com 2024-02-23 16:29:23 +08:00
• bfe7005962 Accept Merge Request #845: (feature/优化ftp -> develop) 杨金灵 2024-02-23 16:18:57 +08:00
• 45fa6931d7 新增下拉检测文件 jinling.yang 2024-02-23 16:16:49 +08:00
• 6f82feddeb Accept Merge Request #844: (feature/修复质检接口 -> develop) 杨金灵 2024-02-23 16:03:32 +08:00
• 998900955d 修复质检接口 jinling.yang 2024-02-23 16:01:19 +08:00
• 1c2b50a343 Accept Merge Request #843: (feature/修改机床参数bug -> develop) 龚启豪 2024-02-23 15:34:37 +08:00
• 49d77c736e Accept Merge Request #842: (feature/优化检测文件 -> develop) 杨金灵 2024-02-23 15:33:59 +08:00
• 6711543567 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化检测文件 jinling.yang 2024-02-23 15:33:24 +08:00
• 397cae4f87 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-02-23 15:31:44 +08:00
• c726bb614c 新增获取库区信息定时器 修改库存变更接口 qihao.gong@jikimo.com 2024-02-23 15:31:25 +08:00
• 6fa8bfffe7 Accept Merge Request #841: (feature/前端样式修改 -> develop) 黄焱 2024-02-23 15:31:04 +08:00
• 2e62915b41 通过质检接口的质检文件路径获取 jinling.yang 2024-02-23 15:29:21 +08:00
• a80f62c87f 扫码RFID实时显示功能 黄焱 2024-02-23 15:28:30 +08:00
• 99ba2d0a4d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-02-23 11:58:26 +08:00
• b045854a63 修改库位变更接口 qihao.gong@jikimo.com 2024-02-23 11:58:12 +08:00
• f015cbb9fd Accept Merge Request #839: (feature/修改机床参数bug -> develop) 马广威 2024-02-23 11:12:11 +08:00
• 2b9c088d1d Accept Merge Request #840: (feature/修复agv接口 -> develop) 杨金灵 2024-02-23 11:12:05 +08:00
• 9ecd95faa0 1.修复质量模块的权限2.修复agv接口 jinling.yang 2024-02-23 11:09:57 +08:00
• 7062289c89 修改工单开始 qihao.gong@jikimo.com 2024-02-23 10:41:28 +08:00
• d2b80ea42c 修改工单开始接口 qihao.gong@jikimo.com 2024-02-23 10:32:51 +08:00
• 39381ac5b0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-23 10:20:11 +08:00
• cc7b3ea25e Merge branch 'feature/优化后置三元检测' into develop jinling.yang 2024-02-23 10:19:50 +08:00
• 85a4fa49a4 Accept Merge Request #838: (feature/优化后置三元检测 -> develop) 杨金灵 2024-02-23 10:19:25 +08:00
• 935b317fe6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化后置三元检测 jinling.yang 2024-02-23 10:17:46 +08:00
• ad0b9983bf 1.新增检测报告链接地址字段 2.优化rfid码扫描 3.优化工单页面 jinling.yang 2024-02-23 10:17:20 +08:00
• 648954faa3 Accept Merge Request #837: (feature/修改机床参数bug -> develop) 龚启豪 2024-02-23 10:15:16 +08:00
• e885d7b372 修改开始结束工单 qihao.gong@jikimo.com 2024-02-23 10:13:41 +08:00
• 5fcff90c01 Accept Merge Request #836: (feature/修改机床参数bug -> develop) 龚启豪 2024-02-23 09:58:12 +08:00
• 8c4c8b0323 Accept Merge Request #835: (feature/制造代码优化 -> develop) 马广威 2024-02-23 09:57:34 +08:00
• f8101c2a16 修改货位编码规则 mgw 2024-02-23 09:57:02 +08:00
• b7c64d9eb4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-02-23 09:56:16 +08:00
• e456b811f2 修改工单开始结束接口 qihao.gong@jikimo.com 2024-02-23 09:56:01 +08:00
• 01c4e13198 Accept Merge Request #834: (feature/优化接口和工单 -> develop) 杨金灵 2024-02-22 19:41:54 +08:00
• 7bf2316c09 优化接口和工单 jinling.yang 2024-02-22 19:40:25 +08:00
• e55f7c59e6 Accept Merge Request #833: (feature/修复日计划工单接口和http -> develop) 杨金灵 2024-02-22 18:54:15 +08:00
• 5916b4a740 修复日计划工单接口和http jinling.yang 2024-02-22 18:52:36 +08:00
• a3f6946823 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-22 18:26:41 +08:00
• 87cda7e641 Merge branch 'feature/修复日计划工单和工件预调接口' into develop jinling.yang 2024-02-22 18:24:54 +08:00
• 247b82e816 Accept Merge Request #832: (feature/修复日计划工单和工件预调接口 -> develop) 杨金灵 2024-02-22 18:24:31 +08:00
• 4d745b48cf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复日计划工单和工件预调接口 jinling.yang 2024-02-22 18:23:14 +08:00
• fc2588140b 修复日计划工单和工件预调接口 jinling.yang 2024-02-22 18:22:56 +08:00
• e619e6660e Accept Merge Request #831: (feature/刀具组接口18-19优化 -> develop) 禹翔辉 2024-02-22 18:16:51 +08:00
• 475b45b293 Merge branch 'feature/中控接口14-16优化' into feature/刀具组接口18-19优化 yuxianghui 2024-02-22 18:14:56 +08:00
• 3c4a2b58b1 1、优化刀具接口 yuxianghui 2024-02-22 18:12:51 +08:00
• a8fb541568 Accept Merge Request #830: (feature/修复日计划工单接口 -> develop) 杨金灵 2024-02-22 18:03:09 +08:00
• 90c499f9c7 修复日计划工单 jinling.yang 2024-02-22 18:00:16 +08:00
• e6bef9d1ab Accept Merge Request #829: (feature/新增agv反馈接口 -> develop) 马广威 2024-02-22 17:18:31 +08:00
• 5d22318f7d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增agv反馈接口 jinling.yang 2024-02-22 17:17:02 +08:00
• da97fce6d5 新增agv相关接口 jinling.yang 2024-02-22 17:16:16 +08:00
• b34611d1b3 Accept Merge Request #828: (feature/修改机床参数bug -> develop) 龚启豪 2024-02-22 16:55:55 +08:00
• 75e2b2fabe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-02-22 16:54:15 +08:00
• df57b33e19 修改接口 qihao.gong@jikimo.com 2024-02-22 16:52:48 +08:00
• 0ca4165219 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-22 16:00:03 +08:00
• 9ce4cf779b Merge branch 'feature/新增cmm程序' into develop jinling.yang 2024-02-22 15:58:53 +08:00
• 4ccebfac29 Accept Merge Request #827: (feature/新增cmm程序 -> develop) 杨金灵 2024-02-22 15:58:35 +08:00
• 1142400e9c 新增库位接口（启豪的代码） jinling.yang 2024-02-22 15:56:34 +08:00
• abcada8466 新增cmm程序对象及新增cmm接口 jinling.yang 2024-02-22 15:55:35 +08:00
• a8bedd0425 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-02-22 15:35:48 +08:00
• fe89a971a6 Merge branch 'feature/优化工件预调接口' into develop jinling.yang 2024-02-22 15:23:33 +08:00
• 6df562a8ab Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件预调接口 jinling.yang 2024-02-22 15:20:13 +08:00
• c086bd03f0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-22 15:19:58 +08:00
• 9e591c3813 修复工件预调接口 jinling.yang 2024-02-22 15:18:40 +08:00
• 0be75bc54f Merge branch 'feature/优化中控接口' into develop jinling.yang 2024-02-22 14:44:06 +08:00
• d94e4469f6 Accept Merge Request #825: (feature/优化中控接口 -> develop) 杨金灵 2024-02-22 14:43:48 +08:00
• 4b4fd649e6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化中控接口 jinling.yang 2024-02-22 14:42:06 +08:00
• fad44a5413 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-22 14:41:47 +08:00
• 8910b3493e Accept Merge Request #824: (feature/中控刀具接口优化 -> develop) 禹翔辉 2024-02-22 14:35:44 +08:00
• 20fe65c73c Merge branch 'feature/刀具组接口优化' into feature/中控刀具接口优化 yuxianghui 2024-02-22 14:34:16 +08:00
• 3fe9c9e532 修改接口方法 qihao.gong@jikimo.com 2024-02-22 14:30:51 +08:00
• 259d723ec9 优化刀具组接口 yuxianghui 2024-02-22 14:30:38 +08:00
• 0d755a50ae 优化工单相关接口 jinling.yang 2024-02-22 14:26:56 +08:00
• e27f2f72bf Accept Merge Request #823: (feature/刀具组接口优化 -> develop) 禹翔辉 2024-02-22 14:26:26 +08:00
• b6ea81d07f Merge branch 'feature/中控接口14-19优化' into feature/刀具组接口优化 yuxianghui 2024-02-22 14:24:26 +08:00
• ed8cbb1f81 1、优化刀具组接口 yuxianghui 2024-02-22 14:23:19 +08:00
• 65b5f7f30a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-22 13:44:25 +08:00
• bc30c0558d Accept Merge Request #822: (feature/修复中控接口 -> develop) 杨金灵 2024-02-22 11:56:38 +08:00
• 8913d2f65f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复中控接口 jinling.yang 2024-02-22 11:54:18 +08:00
• 907f5db4e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-22 11:54:01 +08:00
• 79c6459adf 1.cnc工单新增程序文件字段2.优化获取编程单接口3.修复与中控对接的接口 jinling.yang 2024-02-22 11:53:50 +08:00
• 87e9ecb9e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-02-22 10:24:03 +08:00
• e5129fe55f Accept Merge Request #821: (feature/中控接口14-19优化 -> develop) 禹翔辉 2024-02-22 10:20:15 +08:00
• 5f760cf94b Merge branch 'feature/新增中控接口' into feature/中控接口14-19优化 yuxianghui 2024-02-22 10:17:24 +08:00
• ce01127664 中控对接接口优化 yuxianghui 2024-02-22 10:15:07 +08:00
• ef3219a098 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-22 09:35:37 +08:00
• f7e6be7925 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品的权限优化 feature/产品的权限优化 jinling.yang 2024-02-22 09:35:18 +08:00
• 473a8ea6fe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-02-21 16:40:24 +08:00
• 8695a66e3d Accept Merge Request #820: (feature/新增中控接口 -> develop) 禹翔辉 2024-02-21 16:28:39 +08:00
• 410b384fd6 Merge branch 'feature/中控接口优化' into feature/新增中控接口 yuxianghui 2024-02-21 16:26:27 +08:00
• bb321f90a5 处理库存报错bug qihao.gong@jikimo.com 2024-02-21 16:26:18 +08:00
• 51b7bcac8a 1、新增刀具组、机床刀具组接口，修改中控相关接口名称 yuxianghui 2024-02-21 16:24:10 +08:00
• 36ce43cf8a Accept Merge Request #819: (feature/制造代码优化 -> develop) 马广威 2024-02-21 15:26:42 +08:00
• b4538a3f9d 修复序列号问题 mgw 2024-02-21 15:25:55 +08:00
• af725fa363 Merge branch 'feature/优化快速订单' into develop jinling.yang 2024-02-21 14:54:58 +08:00
• 7d3a320893 Accept Merge Request #818: (feature/优化快速订单 -> develop) 杨金灵 2024-02-21 14:54:40 +08:00
• 0354f6b136 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化快速订单 jinling.yang 2024-02-21 14:52:36 +08:00
• 1e006b0bd7 1.工单新增rfid字段 2.修改中控对接的工单接口 3.快速订单材料，型号，客户修改为可选择 jinling.yang 2024-02-21 14:52:14 +08:00