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

• 19dbd9901d Accept Merge Request #1455: (feature/制造功能优化 -> develop) 马广威 2024-10-24 16:06:50 +08:00
• 4985b0a85d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-10-24 16:05:03 +08:00
• 39f99d6ce7 处理工单的组件不存在时报错的问题 mgw 2024-10-24 16:04:38 +08:00
• c8f25ea4b3 Accept Merge Request #1454: (feature/制造功能优化 -> develop) 马广威 2024-10-24 15:51:11 +08:00
• cab9e08066 增加对Enter的判断 mgw 2024-10-24 15:50:32 +08:00
• 2b83f82989 Accept Merge Request #1453: (feature/制造功能优化 -> develop) 马广威 2024-10-24 15:34:06 +08:00
• 598e8fee9c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-10-24 15:32:41 +08:00
• 6f3a788101 将扫描rfid绑定并开启装夹工单写成widget形式 mgw 2024-10-24 15:32:15 +08:00
• 30ff349b37 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-24 15:17:59 +08:00
• e264306fed Accept Merge Request #1452: (feature/auxiliary_files_upload -> develop) 管欢 2024-10-24 14:58:34 +08:00
• 4018797384 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-24 14:57:01 +08:00
• f557cb8d10 零件图纸,质检标准显示位置修改 feature/auxiliary_files_upload guanhuan 2024-10-24 14:55:36 +08:00
• a1efde6ef9 Merge branch 'feature/修复销售订单逾期过期' into develop jinling.yang 2024-10-24 14:41:10 +08:00
• cf34e28e35 Accept Merge Request #1451: (feature/修复销售订单逾期过期 -> develop) 杨金灵 2024-10-24 14:40:28 +08:00
• b7595fe4ec Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复销售订单逾期过期 jinling.yang 2024-10-24 14:28:07 +08:00
• 2551d82a99 修复销售订单逾期过期 jinling.yang 2024-10-24 14:27:44 +08:00
• 0cedba8ea4 Accept Merge Request #1450: (feature/auxiliary_files_upload -> develop) 管欢 2024-10-24 14:24:18 +08:00
• 3f84972bfd 删除多余代码 胡尧 2024-10-24 13:57:26 +08:00
• d64a814251 制造订单零件图纸,质检标准显示 guanhuan 2024-10-24 11:33:10 +08:00
• 86d5de4fa1 Accept Merge Request #1449: (feature/plan_slow -> develop) 胡尧 2024-10-24 11:30:06 +08:00
• ed15958319 解决报错 胡尧 2024-10-24 11:29:36 +08:00
• 0bf9c752f6 Accept Merge Request #1442: (feature/machining_accuracy_sync -> develop) 廖丹龙 2024-10-24 11:23:20 +08:00
• e62eb060fb Accept Merge Request #1448: (feature/添加输出 -> develop) 杨金灵 2024-10-24 10:54:00 +08:00
• 563b44adb1 添加输出 jinling.yang 2024-10-24 10:53:04 +08:00
• a094946428 按钮位置修改 liaodanlong 2024-10-24 10:37:50 +08:00
• d28fd5d787 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-24 10:35:52 +08:00
• 41c357d124 Merge branch 'feature/修复设备文件' into develop jinling.yang 2024-10-24 10:32:46 +08:00
• f94d52a4d9 Accept Merge Request #1447: (feature/修复设备文件 -> develop) 杨金灵 2024-10-24 10:30:39 +08:00
• 74dc31b083 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-24 10:28:41 +08:00
• 3b1fca529a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-24 10:28:07 +08:00
• 843eeb8a89 修复设备文件 jinling.yang 2024-10-24 10:27:46 +08:00
• 12e81ec702 Accept Merge Request #1446: (feature/plan_slow -> develop) 胡尧 2024-10-24 10:15:55 +08:00
• fe2af8a4ce Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-24 10:13:28 +08:00
• f337a30aba Merge branch 'feature/优化加工质检' into develop jinling.yang 2024-10-24 10:09:45 +08:00
• 7f3a8d877f Accept Merge Request #1445: (feature/优化加工质检 -> develop) 杨金灵 2024-10-24 10:09:29 +08:00
• 5e6a7d0a39 还原代码 jinling.yang 2024-10-24 10:07:56 +08:00
• 5788a157c5 还原代码 jinling.yang 2024-10-24 10:03:18 +08:00
• 0b70447333 修改排程逻辑 胡尧 2024-10-24 09:47:20 +08:00
• de8ba77bef 优化加工质检页面 jinling.yang 2024-10-24 09:22:35 +08:00
• 1026c0edd0 修改排程逻辑 胡尧 2024-10-24 09:18:21 +08:00
• f366b650d0 Accept Merge Request #1444: (feature/auxiliary_files_upload -> develop) 管欢 2024-10-23 17:54:42 +08:00
• 6054ce39f3 附件文件名 guanhuan 2024-10-23 17:43:03 +08:00
• e1e9dc425b Accept Merge Request #1443: (feature/工单状态优化 -> develop) 禹翔辉 2024-10-23 17:12:17 +08:00
• 3a2a942f3b Merge branch 'feature/设备维保优化' into feature/工单状态优化 yuxianghui 2024-10-23 17:05:47 +08:00
• bf9d848f10 1、工单状态优化 yuxianghui 2024-10-23 17:04:35 +08:00
• add7d404a0 质检单类型翻译 liaodanlong 2024-10-23 17:03:16 +08:00
• 7e6fa7b6c7 产品类别隐藏 liaodanlong 2024-10-23 17:02:24 +08:00
• 3fd17302f5 Accept Merge Request #1440: (feature/设备维保优化 -> develop) 禹翔辉 2024-10-23 15:51:06 +08:00
• db9cee3e28 Accept Merge Request #1441: (feature/workorder_exceptions -> develop) 胡尧 2024-10-23 15:50:31 +08:00
• 97a26dfa06 修改工单通知筛选条件 feature/workorder_exceptions 胡尧 2024-10-23 15:50:01 +08:00
• cebd895811 Merge branch 'feature/设备模块优化' into feature/设备维保优化 yuxianghui 2024-10-23 15:49:13 +08:00
• bb6c208d37 设备维保计划优化 yuxianghui 2024-10-23 15:48:33 +08:00
• 921f2c3503 Accept Merge Request #1439: (feature/workorder_exceptions -> develop) 胡尧 2024-10-23 15:38:55 +08:00
• 1224e0e094 修改工单通知筛选条件 胡尧 2024-10-23 15:38:09 +08:00
• a571a870d3 修改工单通知筛选条件 胡尧 2024-10-23 15:33:48 +08:00
• a28d20b3bf 修改排程逻辑 胡尧 2024-10-23 15:30:05 +08:00
• d4e0d36166 Accept Merge Request #1438: (feature/machining_accuracy_sync -> develop) 管欢 2024-10-23 14:00:41 +08:00
• 39579aef10 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化加工质检 jinling.yang 2024-10-23 11:56:16 +08:00
• 1fe8fd6933 优化定时器代码 jinling.yang 2024-10-23 11:55:43 +08:00
• 3b1caca62b 还原 liaodanlong 2024-10-23 11:00:19 +08:00
• 3fe8c957be 加工精度字段信息修改 liaodanlong 2024-10-23 10:41:32 +08:00
• 98923c1797 1、设备维保优化 yuxianghui 2024-10-22 17:52:20 +08:00
• 8661dd16c1 加工精度同步 guanhuan 2024-10-22 15:37:41 +08:00
• 7157ea1587 加工精度同步 guanhuan 2024-10-22 15:35:34 +08:00
• a580a12d69 Accept Merge Request #1437: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-10-22 13:56:38 +08:00
• 0d512e2e43 制造订单添加订单交期字段信息 liaodanlong 2024-10-22 13:55:24 +08:00
• 103069c554 Accept Merge Request #1436: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-10-22 13:48:28 +08:00
• f2482b5128 处理功能刀具产生库存移动时，功能刀具列表的功能刀具位置没有实时发生变更的问题 yuxianghui 2024-10-22 13:45:08 +08:00
• da38d24111 制造订单添加订单交期字段信息 liaodanlong 2024-10-22 13:33:53 +08:00
• 1f0ebe71c7 Accept Merge Request #1435: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-10-22 11:56:28 +08:00
• f897955f68 制造订单添加订单交期字段信息 liaodanlong 2024-10-22 11:45:08 +08:00
• 451e70b7c7 Accept Merge Request #1434: (feature/workorder_exceptions -> develop) 胡尧 2024-10-21 17:03:34 +08:00
• 6c1c2ca0fc 修改无功能刀具原因话术 胡尧 2024-10-21 17:02:59 +08:00
• e7420365cf Accept Merge Request #1433: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-10-21 16:09:08 +08:00
• 736a18518c 制造订单添加订单交期字段信息 liaodanlong 2024-10-21 16:07:43 +08:00
• 41b287d559 制造订单添加订单交期字段信息 liaodanlong 2024-10-21 16:06:03 +08:00
• 5d8e0bda08 Accept Merge Request #1432: (feature/workorder_exceptions -> develop) 胡尧 2024-10-21 15:41:06 +08:00
• e9dbbaedf4 处理设备故障的问题 胡尧 2024-10-21 15:40:38 +08:00
• 92ae6be3bd Accept Merge Request #1431: (feature/workorder_exceptions -> develop) 胡尧 2024-10-21 14:59:57 +08:00
• b00038aaed 修改YC0004消息推送 胡尧 2024-10-21 14:59:16 +08:00
• 86c1880cdb 修改模板标题 胡尧 2024-10-21 14:41:09 +08:00
• cfd2dda4e6 Accept Merge Request #1430: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-10-21 14:34:07 +08:00
• c01e9a4d39 制造订单添加订单交期字段信息 liaodanlong 2024-10-21 14:18:53 +08:00
• 88ff4bbaa9 Accept Merge Request #1429: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-10-21 14:01:20 +08:00
• f62c70d354 Merge branch 'refs/heads/develop' into feature/销售和排程添加消息推送 liaodanlong 2024-10-21 13:57:24 +08:00
• 22c9de86f6 制造订单添加订单交期字段信息 liaodanlong 2024-10-21 13:56:34 +08:00
• b362f74336 Accept Merge Request #1428: (feature/workorder_exceptions -> develop) 胡尧 2024-10-21 13:47:36 +08:00
• 81cfbfb540 修改接口参数 胡尧 2024-10-21 11:46:14 +08:00
• 668db4475f Accept Merge Request #1427: (feature/workorder_exceptions -> develop) 胡尧 2024-10-21 11:37:48 +08:00
• 2af21bc4ee 修改单元测试 胡尧 2024-10-21 11:37:01 +08:00
• e6614a624f Accept Merge Request #1426: (feature/auxiliary_files_upload -> develop) 管欢 2024-10-21 10:11:36 +08:00
• 124bc8478e 辅助文件上传 guanhuan 2024-10-21 10:09:19 +08:00
• 1a3a178ec6 Revert "辅助文件上传" guanhuan 2024-10-21 10:08:35 +08:00
• cae5149fba 辅助文件上传 guanhuan 2024-10-21 10:07:49 +08:00
• 5c4c036948 Accept Merge Request #1425: (feature/auxiliary_files_upload -> develop) 管欢 2024-10-21 10:01:22 +08:00
• 4003d6a652 Merge branch 'refs/heads/develop' into feature/auxiliary_files_upload guanhuan 2024-10-21 09:50:09 +08:00
• 0e8e81e4cb Accept Merge Request #1423: (feature/临时分支 -> develop) 胡嘉莹 2024-10-18 16:44:46 +08:00
• 8cff3d8377 sf销售订单详情新增是否带料，带料尺寸，修改bfm分配工厂，sf接收订单生成销售订单新增两个字段，并修改订单详情及订单详情表单新增字段显示 feature/临时分支 hujiaying 2024-10-18 16:39:15 +08:00
• b132771c92 辅助文件上传 guanhuan 2024-10-18 14:32:20 +08:00
• cbaf0d79c1 Accept Merge Request #1422: (feature/制造功能优化 -> develop) 马广威 2024-10-18 10:18:28 +08:00