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

• 1e3f8f005e Accept Merge Request #1810: (feature/制造功能优化 -> develop) 马广威 2025-02-17 15:41:32 +08:00
• 5d2cadc3d0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-17 15:37:58 +08:00
• 567ea84b00 完善人工编程功能 mgw 2025-02-17 15:37:30 +08:00
• 006152edd9 Accept Merge Request #1809: (feature/库存优化_2 -> develop) 禹翔辉 2025-02-17 15:19:55 +08:00
• 60f525e228 Merge branch 'feature/库存优化_1' into feature/库存优化_2 yuxianghui 2025-02-17 15:18:49 +08:00
• 3d2e383330 1、处理 sf-制造订单-通过质量检查对装夹预调进行返工-制造订单未记录检测结果 问题；2、处理 手动创建调拨单右上角会关联坯料采购单和坯料委外单 问题 yuxianghui 2025-02-17 15:17:54 +08:00
• d25022204b Accept Merge Request #1808: (feature/mrp_bug_fixed -> develop) 胡尧 2025-02-17 13:24:31 +08:00
• 8095a8a972 修改配送类型的字段关联形式，修改工件配送列表页的默认筛选条件 胡尧 2025-02-17 13:23:32 +08:00
• 781e1d616f Accept Merge Request #1807: (feature/库存优化_1 -> develop) 禹翔辉 2025-02-17 12:44:29 +08:00
• f556e45102 Merge branch 'feature/同步接口优化' into feature/库存优化_1 yuxianghui 2025-02-17 12:42:55 +08:00
• fc4eae0488 完成 入库优化：自动确认序列号 需求 yuxianghui 2025-02-17 12:42:07 +08:00
• 3e9b6f808d 优化取消接单功能 mgw 2025-02-17 10:00:40 +08:00
• 3f1c745ece Accept Merge Request #1806: (feature/前端样式修改 -> develop) 黄焱 2025-02-17 08:39:25 +08:00
• b117fde8c3 删除模块，移到efms里面，修改样式 hyyy 2025-02-14 17:31:19 +08:00
• e98a9a3788 增加取消订单其他功能 mgw 2025-02-14 17:29:33 +08:00
• 3ac096e9a7 取消接单需求进行中 mgw 2025-02-13 17:41:18 +08:00
• 3130ef4983 增加工单的开始时间已经leave_id字段的监控，异常则发送企业微信消息 胡尧 2025-02-13 15:48:41 +08:00
• 5463bff63b Accept Merge Request #1805: (feature/同步接口优化 -> develop) 禹翔辉 2025-02-13 15:15:28 +08:00
• ea96ae2c55 Merge branch 'feature/库存优化' into feature/同步接口优化 yuxianghui 2025-02-13 15:00:25 +08:00
• a05885936d 刀具标准库及关联模型同步接口优化 yuxianghui 2025-02-13 14:26:01 +08:00
• 32ead7fa07 去掉设置tree字段为隐藏的代码 胡尧 2025-02-13 13:29:54 +08:00
• cf9095b51b Accept Merge Request #1804: (feature/mrp_bug_fixed -> develop) 胡尧 2025-02-13 13:04:40 +08:00
• 827311a146 质量检查列表修改3个字段的隐藏默认值 胡尧 2025-02-13 13:04:16 +08:00
• 941b8c0be7 增加测试数据清理模块 胡尧 2025-02-13 11:31:35 +08:00
• f0525355c4 Accept Merge Request #1803: (feature/mrp_bug_fixed -> develop) 胡尧 2025-02-13 10:27:43 +08:00
• bb1012a15d 质量检查列表增加默认筛选项 胡尧 2025-02-13 10:26:58 +08:00
• 68e9537cdb Accept Merge Request #1802: (feature/mrp_bug_fixed -> develop) 胡尧 2025-02-12 15:34:34 +08:00
• 2411d8334c 修改客供料的供货路线不能选择外购 胡尧 2025-02-12 15:33:57 +08:00
• 97d4e03ef8 Accept Merge Request #1801: (feature/mrp_bug_fixed -> develop) 胡尧 2025-02-12 15:23:19 +08:00
• b7a2a763ac 修改质量检查列表页 胡尧 2025-02-12 15:14:27 +08:00
• 7e0f392550 Accept Merge Request #1800: (feature/库存优化 -> develop) 禹翔辉 2025-02-12 11:32:03 +08:00
• c223869bbd Merge branch 'feature/销售视图优化' into feature/库存优化 yuxianghui 2025-02-12 11:30:27 +08:00
• 7a6538bcc1 完成 库存单据列表增加字段【需求数量】 需求 yuxianghui 2025-02-12 11:29:46 +08:00
• d3cfec2f35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-12 09:49:54 +08:00
• 6b9428c8bf 多种状态下显示拒绝接单/取消按钮 mgw 2025-02-10 16:38:34 +08:00
• f25d06e08f Accept Merge Request #1799: (feature/制造功能优化 -> develop) 马广威 2025-02-10 13:35:06 +08:00
• 62314d38b3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-10 13:34:06 +08:00
• 027be2b021 调整工单处人工编程可见 mgw 2025-02-10 13:33:46 +08:00
• 372dfd99c4 Accept Merge Request #1798: (feature/制造功能优化 -> develop) 马广威 2025-02-10 13:15:01 +08:00
• c702d1f3be Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-10 13:14:25 +08:00
• 7e33ca44d0 人工线下加工工单标识 mgw 2025-02-10 13:13:57 +08:00
• c7d9b15624 Accept Merge Request #1797: (feature/制造功能优化 -> develop) 马广威 2025-02-10 11:30:52 +08:00
• a4d640acb5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-10 11:29:56 +08:00
• 523cc4ac5e 增加人工线下加工工单的查找 mgw 2025-02-10 11:29:37 +08:00
• 9aa2bd5d54 Accept Merge Request #1796: (feature/制造功能优化 -> develop) 马广威 2025-02-10 11:00:17 +08:00
• ae23edb9d5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-10 10:58:19 +08:00
• 9695997542 人工线下加工编程方式设置 mgw 2025-02-10 10:58:01 +08:00
• 90243a7d2f Accept Merge Request #1795: (feature/取消加工订单 -> develop) 管欢 2025-02-10 09:53:46 +08:00
• 5dc5602e3d 月结取消订单 guanhuan 2025-02-10 09:47:42 +08:00
• cbf58fd3fb Accept Merge Request #1794: (feature/mrp_bug_fixed -> develop) 胡尧 2025-02-10 09:30:49 +08:00
• 0ada4933ba Accept Merge Request #1793: (feature/制造功能优化 -> develop) 马广威 2025-02-10 09:14:33 +08:00
• b1261bb91b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-10 09:13:16 +08:00
• ffde591b3c 人工线下加工默认加工面ZM mgw 2025-02-10 09:12:58 +08:00
• 356e1e55e4 解决采购总监选择销售员报错的问题 胡尧 2025-02-10 09:03:13 +08:00
• b6ce462171 Accept Merge Request #1792: (feature/制造功能优化 -> develop) 马广威 2025-02-08 16:49:34 +08:00
• e8b5ff0b75 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-08 16:48:59 +08:00
• ac3b50c534 增加人工线下加工程序写入 mgw 2025-02-08 16:48:36 +08:00
• bc4806b303 1、销售订单详情界面列表优化；2、完成 人工线下加工制造订单提交返工时-建议隐藏【保留装夹预调测量数据】 需求 yuxianghui 2025-02-08 16:47:06 +08:00
• e7bc434d60 Accept Merge Request #1791: (feature/制造功能优化 -> develop) 马广威 2025-02-08 16:01:11 +08:00
• 2de501b61d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-08 16:00:25 +08:00
• 976d75973d 调整程序写入逻辑 mgw 2025-02-08 16:00:07 +08:00
• e20bf3816a Accept Merge Request #1790: (feature/制造功能优化 -> develop) 马广威 2025-02-08 14:10:19 +08:00
• 44f29d001e 调整人工线下加工页面内容 mgw 2025-02-08 14:08:53 +08:00
• aff81f0b3a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-08 13:32:59 +08:00
• 88840abf9f 制造订单编程状态搜索的优化需求 mgw 2025-02-08 13:32:40 +08:00
• 332276752a Accept Merge Request #1789: (feature/mrp_bug_fixed -> develop) 胡尧 2025-02-07 10:54:56 +08:00
• d852cf54df 修复bug 胡尧 2025-02-07 10:49:17 +08:00
• 6756cc201c Accept Merge Request #1788: (feature/工单返工优化 -> develop) 管欢 2025-02-06 11:14:52 +08:00
• 06dd9c12e0 人工线下加工工单下发通知修改 feature/工单返工优化 guanhuan 2025-02-06 10:43:11 +08:00
• 978e427734 调整制造订单集合 mgw 2025-02-05 17:44:32 +08:00
• dd35a6ae5f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-05 17:42:10 +08:00
• 0a8cc050b8 人工线下加工工单也需要走cloud编程流程的优化需求 mgw 2025-02-05 17:41:52 +08:00
• eb47e4c963 Accept Merge Request #1787: (feature/工单返工优化 -> develop) 管欢 2025-01-23 16:48:24 +08:00
• 5636681ee6 CNC工单返工 guanhuan 2025-01-23 16:42:16 +08:00
• 9b49edb290 装夹工单返工 guanhuan 2025-01-23 13:55:35 +08:00
• b604209df4 刀具标准库列表视图添加创建时间与修改时间 liaodanlong 2025-01-21 16:23:34 +08:00
• d896118ea9 报废不申请重新编程时新生成的制造订单没有程序 feature/报废优化 guanhuan 2025-01-21 16:23:23 +08:00
• a9b4c5d91b 保持智能工厂刀具标准库与cloud一致 liaodanlong 2025-01-21 16:04:16 +08:00
• 186ac391ea 并发创建制造订单的工单 feature/customer_supply liaodanlong 2025-01-21 15:53:09 +08:00
• d3a1e9b341 Merge branch 'release/release_2.8' master_sf_20250121_2.9 胡尧 2025-01-21 10:43:09 +08:00
• 39b29960e3 Accept Merge Request #1786: (feature/验证合并的逻辑 -> develop) 胡尧 2025-01-21 10:40:27 +08:00
• 6abb237491 Merge branch 'develop' into feature/验证合并的逻辑 feature/验证合并的逻辑 胡尧 2025-01-21 10:39:41 +08:00
• b0c043676c Accept Merge Request #1785: (release/release_2.8 -> develop) 胡尧 2025-01-21 10:39:19 +08:00
• 8f9b7b2fb0 优化工件下产线，修改CNC加工工单状态为待检测时，同步修改对应质检单状态为待处理 release/release_2.8 yuxianghui 2025-01-20 15:39:08 +08:00
• 32255af3a3 申请编程状态 mgw 2025-01-20 14:53:26 +08:00
• 955b6a6213 工单优化 yuxianghui 2025-01-20 14:47:09 +08:00
• 8e788d3745 处理CNC加工工单通过接口上产线下产线变更为待检测时，对应质检单还是等待状态问题 yuxianghui 2025-01-20 14:18:02 +08:00
• dc843588e9 制造列表新增编程状态显示 feature/修改制造订单列表显示 guanhuan 2025-01-20 14:09:23 +08:00
• 8bfe5eca03 Accept Merge Request #1783: (feature/制造功能优化 -> develop) 马广威 2025-01-20 14:04:27 +08:00
• dbcf8b1089 申请编程状态控制 mgw 2025-01-20 14:02:54 +08:00
• 0bf701e743 质检单状态优化 yuxianghui 2025-01-20 12:55:12 +08:00
• a96a9f5b75 1、修改工单检测结果只读条件；2、修改质检单完成时同步完成工单判断条件；3、去除只有配置后置三元检测的工单才能看到质检单对应字段、页签的判断条件 yuxianghui 2025-01-20 12:47:11 +08:00
• 9e2704f726 新增工单送检按钮显示的时候隐藏完成按钮 yuxianghui 2025-01-20 10:34:32 +08:00
• c436bbea46 Merge branch 'release/release_2.8' into feature/验证合并的逻辑 胡尧 2025-01-17 16:12:27 +08:00
• 47c73ae66e 处理订单行参数说明的精度问题 胡尧 2025-01-17 15:20:50 +08:00
• 53ceed4649 Accept Merge Request #1782: (feature/前端样式修改 -> develop) 黄焱 2025-01-17 14:22:56 +08:00
• e39e9d8812 放弃保存 -> 不保存 hyyy 2025-01-17 14:17:46 +08:00
• 0a01afc863 Accept Merge Request #1781: (feature/增加质检模块 -> develop) 胡尧 2025-01-17 12:55:39 +08:00
• 98b338f33a 修复采购单没有接收产品的问题 feature/增加质检模块 胡尧 2025-01-17 12:55:09 +08:00
• 3c12b05b94 Accept Merge Request #1780: (feature/增加质检模块 -> develop) 胡尧 2025-01-17 11:27:40 +08:00