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

• 1cac579a1f Merge remote-tracking branch 'origin/develop' into release/release_2.7 guanhuan 2025-01-03 12:59:19 +08:00
• 53ca78a6a3 Accept Merge Request #1708: (feature/消息提醒优化 -> develop) 管欢 2025-01-03 12:54:37 +08:00
• 0d28df0415 适配多层审批 mgw 2025-01-03 12:52:27 +08:00
• d182641d81 外购订单采购单提醒 guanhuan 2025-01-03 12:52:24 +08:00
• 7789c901b2 Accept Merge Request #1707: (feature/制造功能优化 -> develop) 马广威 2025-01-03 11:43:55 +08:00
• aa4b73e406 调整状态字段名称 mgw 2025-01-03 11:43:27 +08:00
• 1ca8ebe3cc Accept Merge Request #1706: (feature/制造功能优化 -> develop) 马广威 2025-01-03 11:33:28 +08:00
• c34cdd595d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-03 11:32:48 +08:00
• 1936b512c2 调整多层审批需求 mgw 2025-01-03 11:32:24 +08:00
• 3c470093d3 Merge branch 'develop' into release/release_2.7 胡尧 2025-01-03 10:24:24 +08:00
• b483097907 Accept Merge Request #1705: (feature/消息提醒优化 -> develop) 管欢 2025-01-03 10:21:33 +08:00
• c6aeff2006 待质检提醒 guanhuan 2025-01-03 10:17:33 +08:00
• 170309b3c0 修改依赖 胡尧 2025-01-03 10:01:52 +08:00
• 58acdc4913 工艺确认重置表面工艺工单的关联采购单代码还原 liaodanlong 2025-01-02 16:38:26 +08:00
• d4537fe73d Accept Merge Request #1704: (feature/消息提醒优化 -> develop) 管欢 2025-01-02 14:24:53 +08:00
• eaaa13fb9a 待质检提醒 guanhuan 2025-01-02 14:21:18 +08:00
• f92bd8263c 待质检提醒 guanhuan 2025-01-02 14:20:31 +08:00
• 5f3957864a Accept Merge Request #1703: (feature/part_number -> develop) 廖丹龙 2025-01-02 13:43:03 +08:00
• f884963abc 工艺确认重置表面工艺工单的关联采购单为草稿 liaodanlong 2025-01-02 13:34:09 +08:00
• 1e17ac07a9 Accept Merge Request #1702: (feature/part_number -> develop) 廖丹龙 2025-01-02 12:52:02 +08:00
• 2f3e12e3af 表面工艺采购单确认订单限制，自动化产线加工路线逻辑矫正 liaodanlong 2025-01-02 12:50:39 +08:00
• 0ce51a4a66 添加人工线下加工工单排序 liaodanlong 2025-01-02 12:49:46 +08:00
• a1bf997d51 采购岗与采购总监岗位添加工单操作权限 liaodanlong 2025-01-02 12:49:05 +08:00
• e6c125cae6 Accept Merge Request #1701: (feature/制造功能优化 -> develop) 马广威 2025-01-02 11:34:28 +08:00
• ac968b0d6e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-02 10:59:27 +08:00
• 81bebf836d sf-采购-询价单状态流转多余按钮影响现有按钮功能 mgw 2025-01-02 10:59:03 +08:00
• d47d3f1638 Accept Merge Request #1700: (feature/前端样式修改 -> develop) 黄焱 2025-01-02 10:31:33 +08:00
• 614447d56e 解开屏蔽的方法 hy 2025-01-02 10:28:40 +08:00
• bf13edc1be Accept Merge Request #1699: (feature/part_number -> develop) 廖丹龙 2025-01-02 09:08:27 +08:00
• e99b8692ea Merge branch 'refs/heads/develop' into feature/part_number liaodanlong 2025-01-02 09:06:41 +08:00
• 701decb38f 表面工艺采购单确认订单进行限制 liaodanlong 2024-12-31 17:08:38 +08:00
• 3c61726fd3 Accept Merge Request #1698: (feature/消息提醒优化 -> develop) 管欢 2024-12-31 16:42:34 +08:00
• 247bebbd75 询价单审批 guanhuan 2024-12-31 16:39:09 +08:00
• c3ceda2ba9 Accept Merge Request #1697: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-31 16:01:03 +08:00
• 281f3c67c3 特殊表面工艺外协采购单发起人修改为供应商的采购员 feature/sale_order_route_pick 胡尧 2024-12-31 16:00:24 +08:00
• 641a669f46 Accept Merge Request #1696: (feature/关闭报废入口 -> develop) 禹翔辉 2024-12-31 15:53:53 +08:00
• 94b1c7d258 关闭报废入口 yuxianghui 2024-12-31 15:50:51 +08:00
• b06b690ae9 Accept Merge Request #1695: (feature/part_number -> develop) 廖丹龙 2024-12-31 14:05:55 +08:00
• 37476bcc88 回退代码 liaodanlong 2024-12-31 14:03:15 +08:00
• af7eeb55f1 Accept Merge Request #1694: (feature/消息提醒优化 -> develop) 管欢 2024-12-31 13:32:34 +08:00
• 39ed32f3e9 修复成品调拨出库订单的状态没变 guanhuan 2024-12-31 13:08:00 +08:00
• 79ec60bd6b Accept Merge Request #1693: (feature/part_number -> develop) 廖丹龙 2024-12-31 12:55:17 +08:00
• 4b7308fdcd sf-制造-外协工单-调拨单已取消问题 liaodanlong 2024-12-31 12:54:16 +08:00
• 198f1145d7 Accept Merge Request #1692: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-31 11:40:03 +08:00
• 64eb66c334 修改退回工艺设计后再确认，采购单编程草稿状态 胡尧 2024-12-31 11:39:36 +08:00
• cff21a4bcc Accept Merge Request #1691: (feature/采购单链接销售单 -> develop) 禹翔辉 2024-12-31 11:35:30 +08:00
• 2373f33315 采购单源单据为入库单时，自动计算对应参考销售订单的值 yuxianghui 2024-12-31 11:34:21 +08:00
• d6e2e554a8 Accept Merge Request #1690: (feature/采购单链接销售单 -> develop) 禹翔辉 2024-12-31 10:58:54 +08:00
• 6c45a0bf4a Merge branch 'feature/入库单优化' into feature/采购单链接销售单 yuxianghui 2024-12-31 10:57:09 +08:00
• 4902fc5d9a 1、采购订单的关联销售订单字段从销售模块搬迁到制造模块，并新增一个many2many类型字段，且对字段的自动计算方法进行优化。 yuxianghui 2024-12-31 10:56:07 +08:00
• 9e5dbc0104 Accept Merge Request #1688: (feature/前端样式修改 -> develop) 黄焱 2024-12-31 10:00:18 +08:00
• c57918736d Accept Merge Request #1689: (feature/消息提醒优化 -> develop) 管欢 2024-12-31 10:00:01 +08:00
• 78a456849c 修复成品调拨出库订单的状态没变 guanhuan 2024-12-31 09:55:16 +08:00
• 1816f1a497 修复表格对不齐问题 hy 2024-12-31 09:45:56 +08:00
• da815c8ea1 Accept Merge Request #1686: (feature/入库单优化 -> develop) 禹翔辉 2024-12-31 08:57:15 +08:00
• 32e3c2f79f 采购订单源文档字段名称改为源单据 yuxianghui 2024-12-31 08:56:41 +08:00
• c478b72e04 Accept Merge Request #1687: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-31 08:54:23 +08:00
• 78b0529809 创建成品时从模板上获取供应商价格 胡尧 2024-12-31 08:54:02 +08:00
• 17ffac63cb Merge branch 'feature/夹具查询优化_2' into feature/入库单优化 yuxianghui 2024-12-31 08:48:50 +08:00
• acee32cc39 1、采购订单form页买家改名为采购员；2、优化成品入库单的的坯料委外加工链接； yuxianghui 2024-12-31 08:47:44 +08:00
• b36cf745c2 Accept Merge Request #1685: (feature/制造功能优化 -> develop) 马广威 2024-12-30 21:38:17 +08:00
• a24279f6e6 添加提交审批的通知消息 mgw 2024-12-30 21:37:10 +08:00
• 68b89999a9 Accept Merge Request #1684: (feature/制造功能优化 -> develop) 马广威 2024-12-30 20:29:57 +08:00
• 7c38c7f643 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-30 20:28:49 +08:00
• 4937c3a812 修改展示名称 mgw 2024-12-30 20:27:57 +08:00
• 05469c71b8 Accept Merge Request #1683: (feature/制造功能优化 -> develop) 马广威 2024-12-30 19:25:14 +08:00
• 210eea3b0b 修改展示名称 mgw 2024-12-30 19:24:45 +08:00
• f58d1058f7 Accept Merge Request #1682: (feature/制造功能优化 -> develop) 马广威 2024-12-30 18:00:08 +08:00
• 0622d7525f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-30 17:59:36 +08:00
• 7556c09ac2 增加活动项 mgw 2024-12-30 17:59:11 +08:00
• 5344e97b7e Accept Merge Request #1681: (feature/夹具查询优化_2 -> develop) 禹翔辉 2024-12-30 17:33:58 +08:00
• 1b10b7bb53 Merge branch 'feature/成品调拨单优化_1' into feature/夹具查询优化_2 yuxianghui 2024-12-30 17:32:28 +08:00
• 9ab164f0fe 1 yuxianghui 2024-12-30 17:31:22 +08:00
• 3b07b26303 Accept Merge Request #1680: (feature/制造功能优化 -> develop) 马广威 2024-12-30 17:28:41 +08:00
• 29a32be8d2 Accept Merge Request #1679: (feature/消息提醒优化 -> develop) 管欢 2024-12-30 17:28:15 +08:00
• 3620412a13 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-30 17:27:46 +08:00
• 5e72e3d1dd 审批明细问题 mgw 2024-12-30 17:27:00 +08:00
• 4137b304f3 消息提醒 guanhuan 2024-12-30 17:25:32 +08:00
• caac651ab4 Accept Merge Request #1678: (feature/制造功能优化 -> develop) 马广威 2024-12-30 17:12:01 +08:00
• 30e496442f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-30 17:11:31 +08:00
• c28c00a47b 调整description mgw 2024-12-30 17:11:08 +08:00
• 4f4fdeecb5 Accept Merge Request #1677: (feature/成品调拨单优化_1 -> develop) 禹翔辉 2024-12-30 17:07:07 +08:00
• 8742f9b98b Merge branch 'feature/成品调拨单优化' into feature/成品调拨单优化_1 yuxianghui 2024-12-30 17:05:45 +08:00
• d7ce69f474 1、询价单的确认按钮权限添加；2、成品调拨单添加对应的坯料采购单和坯料外协单跳转链接 yuxianghui 2024-12-30 17:04:59 +08:00
• cf46cff7e5 Accept Merge Request #1676: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-30 16:33:41 +08:00
• c124e2962c 屏蔽前端代码 胡尧 2024-12-30 16:32:36 +08:00
• f4312c4d4e Accept Merge Request #1675: (feature/消息提醒优化 -> develop) 管欢 2024-12-30 16:20:37 +08:00
• 5928456ffe 提示优化 guanhuan 2024-12-30 16:19:17 +08:00
• 305ea9dff7 Accept Merge Request #1674: (feature/制造功能优化 -> develop) 马广威 2024-12-30 16:04:59 +08:00
• bdfc393099 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-30 16:04:10 +08:00
• 1e1bd63acf 调整提示语句格式 mgw 2024-12-30 16:03:46 +08:00
• fa20bb6eb5 Accept Merge Request #1673: (feature/制造功能优化 -> develop) 马广威 2024-12-30 15:51:19 +08:00
• c82db7159d sf-询价单-新增状态及修改未审批的提示语句 mgw 2024-12-30 15:50:25 +08:00
• 89d6752012 Accept Merge Request #1672: (feature/part_number -> develop) 廖丹龙 2024-12-30 15:40:36 +08:00
• 3060b35ab2 销售订单交付状态修改 liaodanlong 2024-12-30 15:38:43 +08:00
• 17ad976a32 Accept Merge Request #1671: (feature/part_number -> develop) 廖丹龙 2024-12-30 15:28:57 +08:00
• 9f3b351544 sf-工序外协调拨单-外协出库单多生成了一张外协出库调拨单 liaodanlong 2024-12-30 15:25:20 +08:00
• 5dc7dc8e0a Accept Merge Request #1670: (feature/前端样式修改 -> develop) 黄焱 2024-12-30 14:40:22 +08:00
• f1868168af 修复会计列表表头少了列bug hy 2024-12-30 14:38:45 +08:00
• f084b5d765 提示优化 guanhuan 2024-12-30 14:12:54 +08:00