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

• dc5e70c118 调整名称 mgw 2025-03-19 11:33:59 +08:00
• b05492615f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 11:23:49 +08:00
• 03d6f9a32e Accept Merge Request #1930: (feature/制造功能优化 -> develop) 马广威 2025-03-19 11:22:21 +08:00
• 8634c1fc40 调整字段名 mgw 2025-03-19 11:21:28 +08:00
• 32ed0e9693 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 11:18:28 +08:00
• e1c535f907 Accept Merge Request #1929: (feature/制造功能优化 -> develop) 马广威 2025-03-19 11:17:38 +08:00
• a556c21196 增加包名映射 mgw 2025-03-19 11:16:36 +08:00
• 623ebe3ec3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 11:09:16 +08:00
• b1821d3ed6 Accept Merge Request #1928: (feature/制造功能优化 -> develop) 马广威 2025-03-19 11:08:34 +08:00
• a8d8bcbcee state字段添加ondelete策略 mgw 2025-03-19 11:07:49 +08:00
• da06688571 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 11:02:40 +08:00
• e7d8587a32 Accept Merge Request #1927: (feature/制造功能优化 -> develop) 马广威 2025-03-19 11:01:51 +08:00
• b53ea2e0e9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-19 11:01:21 +08:00
• 5b979ffc34 取消列表增加采购申请明细 mgw 2025-03-19 11:00:48 +08:00
• c01451336d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 10:24:26 +08:00
• e5fc3dfe62 Accept Merge Request #1926: (feature/制造功能优化 -> develop) 马广威 2025-03-19 10:23:38 +08:00
• 08cd1a176b 判断文件是否上传 mgw 2025-03-19 10:22:44 +08:00
• 2db5068e85 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 10:06:52 +08:00
• bab21d7b76 Accept Merge Request #1925: (feature/制造功能优化 -> develop) 马广威 2025-03-19 10:05:59 +08:00
• 6bdaad8718 出厂检验报告上传模板后-没有自动新增有数值的列 mgw 2025-03-19 10:03:59 +08:00
• 94441422cd 出厂检验报告已经发布-还可以编辑页面内容-发布后要禁掉编辑功能 mgw 2025-03-19 09:43:23 +08:00
• 5f48dad86c 发料出库单质检弹窗发布前校验 mgw 2025-03-19 08:44:23 +08:00
• c955953335 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-18 16:51:19 +08:00
• f5bf727b34 Accept Merge Request #1924: (feature/制造功能优化 -> develop) 马广威 2025-03-18 16:50:35 +08:00
• c55231555c 修正问题 mgw 2025-03-18 16:49:50 +08:00
• 9220c4b7c4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-18 16:42:51 +08:00
• e4606ece75 Accept Merge Request #1923: (feature/制造功能优化 -> develop) 马广威 2025-03-18 16:42:14 +08:00
• 972c06cdc1 修正数据类型转换 mgw 2025-03-18 16:41:35 +08:00
• 70b21c607e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-18 16:31:48 +08:00
• f8bfb7ba40 Accept Merge Request #1922: (feature/制造功能优化 -> develop) 马广威 2025-03-18 16:29:24 +08:00
• b2c3694a23 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-18 16:28:33 +08:00
• be0df6e66b 调整报告逻辑 mgw 2025-03-18 16:26:39 +08:00
• 242f9c9050 总数量问题 mgw 2025-03-18 15:58:05 +08:00
• 4fe7300ec0 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-18 15:56:19 +08:00
• 307bfa19f2 Accept Merge Request #1921: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-18 15:55:27 +08:00
• 83b051e0b9 材料型号同步添加材料代号 liaodanlong 2025-03-18 15:51:56 +08:00
• 5bbcd8ec23 材料型号同步添加材料代号 liaodanlong 2025-03-18 15:46:22 +08:00
• 282458c945 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-18 13:45:19 +08:00
• b211ffdff9 Accept Merge Request #1920: (feature/制造功能优化 -> develop) 马广威 2025-03-18 13:44:28 +08:00
• cb445393ce Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-18 13:43:36 +08:00
• 25ba61607f 修改模板样式 hyyy 2025-03-18 13:42:42 +08:00
• f6e87493d3 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-18 11:28:23 +08:00
• 8c4c65a00f Accept Merge Request #1919: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-18 11:27:43 +08:00
• 3642398724 表面工艺零件图号没有问题 liaodanlong 2025-03-18 11:25:46 +08:00
• 23bcf13d95 Accept Merge Request #1918: (feature/质检弹窗优化_2 -> develop) 禹翔辉 2025-03-18 11:22:47 +08:00
• 6b78cb72b3 1、质检弹窗和数量应用弹窗顺序调整 yuxianghui 2025-03-18 11:21:56 +08:00
• fde508c563 Accept Merge Request #1917: (feature/制造功能优化 -> develop) 马广威 2025-03-18 11:05:13 +08:00
• b65682f5c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-18 11:04:36 +08:00
• bfe9c51d57 处理质检可能存在多个出厂检验报告问题 mgw 2025-03-18 11:04:19 +08:00
• e0015f9d6b Accept Merge Request #1916: (feature/质检弹窗优化_1 -> develop) 禹翔辉 2025-03-18 10:54:35 +08:00
• 24166c2e71 Merge branch 'feature/质检弹窗优化' into feature/质检弹窗优化_1 yuxianghui 2025-03-18 10:53:29 +08:00
• 8fb90c1c35 调拨验证提示数据信息优化 yuxianghui 2025-03-18 10:52:34 +08:00
• e141f0af2c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-18 10:41:01 +08:00
• f8b5871912 Accept Merge Request #1915: (feature/制造功能优化 -> develop) 马广威 2025-03-18 10:40:19 +08:00
• 40a7c14b81 修复模板不能下载问题 mgw 2025-03-18 10:39:52 +08:00
• 4618c83b2f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-18 09:45:00 +08:00
• dee616fbef Accept Merge Request #1914: (feature/制造功能优化 -> develop) 马广威 2025-03-18 09:44:20 +08:00
• a2868a2581 修复按钮规则；修复排程单取消 mgw 2025-03-18 09:43:48 +08:00
• e89400f04e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-18 09:18:47 +08:00
• 5e5c7e5512 Accept Merge Request #1913: (feature/质检弹窗优化 -> develop) 禹翔辉 2025-03-17 17:31:43 +08:00
• 117d90bd5c 质量检查弹出框顺序修改 yuxianghui 2025-03-17 17:30:42 +08:00
• fb19a19b25 Accept Merge Request #1912: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-17 16:50:52 +08:00
• 1311669814 材料型号同步修改时赋予默认值 liaodanlong 2025-03-17 16:39:49 +08:00
• 8347a8b029 零件图号零件名称无数据 问题修复 liaodanlong 2025-03-17 16:05:42 +08:00
• 051f8128e9 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-17 15:05:47 +08:00
• 2cdad0cec4 Accept Merge Request #1911: (feature/制造功能优化 -> develop) 马广威 2025-03-17 15:03:48 +08:00
• 7df5bea5b1 恢复报告 mgw 2025-03-17 15:03:17 +08:00
• 40965af4c0 Accept Merge Request #1910: (feature/制造功能优化 -> develop) 马广威 2025-03-17 14:26:09 +08:00
• 21876f4b9d 暂时不加载报告 mgw 2025-03-17 14:25:40 +08:00
• 5a8df0a1ae Accept Merge Request #1909: (feature/制造功能优化 -> develop) 马广威 2025-03-17 14:18:43 +08:00
• d280d2b776 暂时屏蔽工厂名称 mgw 2025-03-17 14:18:07 +08:00
• 323a204a48 Accept Merge Request #1907: (feature/质量检查弹出框优化 -> develop) 禹翔辉 2025-03-17 13:52:58 +08:00
• 3ce7f1771a Merge branch refs/heads/develop into refs/heads/feature/质量检查弹出框优化 禹翔辉 2025-03-17 13:52:03 +08:00
• e1dc2bde7e Accept Merge Request #1908: (feature/制造功能优化 -> develop) 马广威 2025-03-17 13:49:25 +08:00
• 495f1962df 恢复流程控制 mgw 2025-03-17 13:47:56 +08:00
• 221eb7c3a1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-17 13:46:40 +08:00
• af529d21ec 调整报告公开可访问 mgw 2025-03-17 13:39:59 +08:00
• 0a1b48ed93 零件图号零件名称数据填充 liaodanlong 2025-03-17 11:26:42 +08:00
• db881ac594 调整报告格式 mgw 2025-03-17 11:26:29 +08:00
• 61776ca6a3 完善出厂报告需求功能 mgw 2025-03-17 11:14:20 +08:00
• 6da31b4f48 质量检查弹出框顺序修改 yuxianghui 2025-03-17 10:54:18 +08:00
• 84f74ae09f 出库单写入报告到bfm mgw 2025-03-17 09:34:47 +08:00
• 561b515242 调整数据类型 mgw 2025-03-17 09:12:44 +08:00
• 71e79502f9 增加报告写入bfm方法 mgw 2025-03-14 19:59:13 +08:00
• 67f3c29af3 调整二维码内容 mgw 2025-03-14 17:58:22 +08:00
• 5d703b8b73 缓存报告附件，并清理旧附件 mgw 2025-03-14 17:44:57 +08:00
• 8f61f258b1 解决冲突 胡尧 2025-03-14 16:08:37 +08:00
• a864845d2b 解决销售订单form中，tree内显示模型的问题 胡尧 2025-03-14 16:06:33 +08:00
• 7755cc3982 优化接口;质量检查wizard添加发布按钮 mgw 2025-03-14 15:45:45 +08:00
• 34565c5d79 Accept Merge Request #1906: (feature/优化调拨列表 -> develop) 管欢 2025-03-14 15:43:18 +08:00
• 0f537a3158 增加文件下载功能 mgw 2025-03-14 14:54:13 +08:00
• 7f99b4ba8b 记录历史报告名字、增加状态修改 mgw 2025-03-14 14:22:25 +08:00
• 4138903bff 调整向导提示语逻辑 mgw 2025-03-14 14:02:14 +08:00
• 4200fdbf3b 限制可上传文件类型 mgw 2025-03-14 13:52:54 +08:00
• a6a2e53111 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-14 13:52:18 +08:00
• 214f45850e 增加对新增删除行的控制 mgw 2025-03-14 12:58:26 +08:00
• c23aa4de75 调整报告样式 mgw 2025-03-14 11:13:50 +08:00
• f66ff6339d 修改 hyyy 2025-03-14 10:52:50 +08:00
• f9525beb65 调整发布业务逻辑 mgw 2025-03-14 10:44:54 +08:00
• 35bcfa6fa1 调整按钮 mgw 2025-03-14 09:50:13 +08:00