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

• 4847596072 Accept Merge Request #1565: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-28 10:18:35 +08:00
• d4ba58b55a 修改排程单的问题 胡尧 2024-11-28 10:17:03 +08:00
• 73ab43f16a 人工线下加工 liaodanlong 2024-11-28 10:05:17 +08:00
• 306d5074f2 Accept Merge Request #1563: (feature/修复报废调拨 -> develop) 杨金灵 2024-11-28 10:03:05 +08:00
• 745abaab2e Accept Merge Request #1564: (feature/制造功能优化 -> develop) 马广威 2024-11-28 10:00:24 +08:00
• c22b91f9d9 优化采购：一个制造订单对应一个采购单 jinling.yang 2024-11-28 09:59:01 +08:00
• 0bea93ea46 1、添加返工向导中选择返工工单限制条件 yuxianghui 2024-11-27 17:54:59 +08:00
• ecf683e663 修复采购 jinling.yang 2024-11-27 17:54:31 +08:00
• 0af7ef905d Accept Merge Request #1562: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-27 17:40:58 +08:00
• c169c0a80b 解决工单完成的问题 胡尧 2024-11-27 17:40:35 +08:00
• 878d62f483 Accept Merge Request #1561: (feature/制造订单状态优化 -> develop) 禹翔辉 2024-11-27 16:31:34 +08:00
• 8a33cea8bd Merge branch 'feature/工序排序优化' into feature/制造订单状态优化 yuxianghui 2024-11-27 16:19:18 +08:00
• d6c194eaa8 处理制造订单状态问题。 yuxianghui 2024-11-27 16:18:18 +08:00
• 13d32c26b6 Accept Merge Request #1560: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-27 15:03:51 +08:00
• df146a4b58 成品委外，坯料自加工的制造排程单生成 胡尧 2024-11-27 15:02:42 +08:00
• 4a02034ee3 Accept Merge Request #1559: (feature/delivery_status -> develop) 廖丹龙 2024-11-27 14:52:18 +08:00
• acb24d69e3 排程 采购单条件判断 liaodanlong 2024-11-27 14:42:41 +08:00
• 56cfeac214 修改坯料冗余描述 胡尧 2024-11-27 11:16:11 +08:00
• b86ad6e5bb Accept Merge Request #1558: (release/release_2.6 -> develop) 胡尧 2024-11-27 11:15:36 +08:00
• f57c95496a 修改数据初始化 胡尧 2024-11-27 11:06:05 +08:00
• 826b2c3e94 Accept Merge Request #1557: (feature/工序排序优化 -> develop) 禹翔辉 2024-11-27 11:05:30 +08:00
• 29b43c6ab8 Merge branch 'feature/返工优化_5' into feature/工序排序优化 yuxianghui 2024-11-27 11:01:49 +08:00
• a434227807 1、工序排序方法优化；2、返工优化 yuxianghui 2024-11-27 11:01:10 +08:00
• 3a7fb81276 Accept Merge Request #1556: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-27 09:54:04 +08:00
• 12224fc892 解决工单开始结束的问题 胡尧 2024-11-27 09:53:17 +08:00
• 64fdedf726 修改工单开始 胡尧 2024-11-27 08:37:12 +08:00
• d3b61f320f 1、返工优化 yuxianghui 2024-11-26 18:01:02 +08:00
• 6be7c05415 优化代码 jinling.yang 2024-11-26 17:05:45 +08:00
• 92b924754d 修复计划调度岗和生产总监权限问题 mgw 2024-11-26 16:56:47 +08:00
• 40ddfdd48f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-26 16:47:22 +08:00
• afa5ad36f2 Accept Merge Request #1554: (feature/修复表面工艺 -> develop) 杨金灵 2024-11-26 16:32:47 +08:00
• 916a5c1054 Accept Merge Request #1555: (feature/前端样式修改 -> develop) 黄焱 2024-11-26 16:31:28 +08:00
• ea914be4c7 修复采购链接 jinling.yang 2024-11-26 16:21:17 +08:00
• e6eb41ad24 优化代码 jinling.yang 2024-11-26 16:15:50 +08:00
• 43ee2d1836 回滚代码 jinling.yang 2024-11-26 16:08:30 +08:00
• 3bd4e6723e Merge branch 'feature/修复表面工艺' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺 jinling.yang 2024-11-26 16:05:52 +08:00
• 0e763c2ca6 还原代码 jinling.yang 2024-11-26 16:05:37 +08:00
• 34353e3614 修复表面工艺 jinling.yang 2024-11-26 16:05:23 +08:00
• d91c7b22d7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-26 16:04:10 +08:00
• ac4861c76e Merge branch 'feature/修复表面工艺' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺 jinling.yang 2024-11-26 16:01:59 +08:00
• 6edd124556 优化 jinling.yang 2024-11-26 16:01:20 +08:00
• f426183d22 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺 jinling.yang 2024-11-26 15:59:31 +08:00
• 33db91f799 Revert "修复表面工艺" jinling.yang 2024-11-26 15:56:22 +08:00
• 8803380a30 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new1 feature/new1 jinling.yang 2024-11-26 15:37:40 +08:00
• b5beaad7bf 修复表面工艺 jinling.yang 2024-11-26 15:37:19 +08:00
• 304259c653 增加列表多选配置 hy 2024-11-26 15:22:41 +08:00
• 5ccc836b20 Accept Merge Request #1553: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-26 11:51:47 +08:00
• 087bb0e8fe 取消制造订单排程时，将其下所有子制造订单改为已排状态的逻辑 胡尧 2024-11-26 11:51:09 +08:00
• 09a476ffa5 修改子制造订单的销售订单 胡尧 2024-11-26 11:26:17 +08:00
• 429ad2b77c Accept Merge Request #1552: (feature/返工优化_5 -> develop) 禹翔辉 2024-11-26 11:17:22 +08:00
• c215e3dc27 Merge branch 'feature/采购优化' into feature/返工优化_5 yuxianghui 2024-11-26 11:15:56 +08:00
• 0a1da79487 1、返工向导模型添加新的工单字段；2、工单tree视图添加重新加工分类 yuxianghui 2024-11-26 11:14:45 +08:00
• 42e4e15cdb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-26 10:58:20 +08:00
• a3e7a23979 Accept Merge Request #1551: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-26 10:48:25 +08:00
• 430a628e18 Merge branch 'develop' into feature/sale_order_route_pick 胡尧 2024-11-26 10:47:32 +08:00
• 5f70690af5 采购单根据采购类型拆分 胡尧 2024-11-26 10:45:43 +08:00
• b852933a9e Accept Merge Request #1550: (feature/修复制造订单问题 -> develop) 杨金灵 2024-11-26 10:44:56 +08:00
• 074c45aa3d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单问题 jinling.yang 2024-11-26 10:41:30 +08:00
• a52545d19a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-26 10:39:23 +08:00
• 3e55bb4717 修复制造订单批量调整 jinling.yang 2024-11-26 10:39:04 +08:00
• be408b98de 修复制造订单相关问题 jinling.yang 2024-11-25 18:00:06 +08:00
• 12cc5fd0d2 Accept Merge Request #1549: (feature/制造功能优化 -> develop) 马广威 2024-11-25 17:25:38 +08:00
• 589df289be 内部调拨单缺少源单据 mgw 2024-11-25 17:24:14 +08:00
• 7abc88f2c3 Accept Merge Request #1548: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-25 17:19:22 +08:00
• f318dc758b 测试坯料采购单根据采购类型合并 胡尧 2024-11-25 17:18:57 +08:00
• 6628e22ac0 Accept Merge Request #1547: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-25 16:46:33 +08:00
• c4cf4e2392 Accept Merge Request #1546: (feature/model_type_update -> develop) 管欢 2024-11-25 16:44:45 +08:00
• 56dfb98df5 子制造订单增加拍承担 胡尧 2024-11-25 16:43:46 +08:00
• 4251e6dec7 修复模型类型详情界面的配置工序不能删除 guanhuan 2024-11-25 16:41:47 +08:00
• bcc9f0301c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-25 16:23:09 +08:00
• 17f2571be3 Merge branch 'feature/修复工序' into develop jinling.yang 2024-11-25 16:22:53 +08:00
• a9b24f7961 Accept Merge Request #1545: (feature/修复工序 -> develop) 杨金灵 2024-11-25 16:22:38 +08:00
• 321125adf6 还原代码 jinling.yang 2024-11-25 16:18:41 +08:00
• 5c0db45223 修复工单开始 jinling.yang 2024-11-25 16:03:40 +08:00
• 76cc8845d2 修复工序 jinling.yang 2024-11-25 15:40:41 +08:00
• 38031a2537 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-25 15:02:08 +08:00
• 1fe64e2b5d Merge branch 'feature/修复制造订单问题' into develop jinling.yang 2024-11-25 15:01:26 +08:00
• d572529a9d Accept Merge Request #1544: (feature/修复制造订单问题 -> develop) 杨金灵 2024-11-25 15:00:40 +08:00
• cb29baa698 还原代码 jinling.yang 2024-11-25 14:31:02 +08:00
• 696d0e2a40 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单问题 jinling.yang 2024-11-25 14:00:04 +08:00
• 75bbcd23a4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-25 13:59:40 +08:00
• 25002406b8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单问题 jinling.yang 2024-11-25 13:59:22 +08:00
• ed3ea32f45 Accept Merge Request #1543: (feature/delivery_status -> develop) 廖丹龙 2024-11-25 11:52:20 +08:00
• 63b1f732db 注释代码 jinling.yang 2024-11-25 11:40:33 +08:00
• 84ebce0786 智能工厂空模型处理 liaodanlong 2024-11-25 11:40:01 +08:00
• ed747ae4d9 Accept Merge Request #1542: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-25 10:44:10 +08:00
• 8a103a7555 人工编程不能选择自动化产线加工 胡尧 2024-11-25 10:43:34 +08:00
• e8c166be31 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-25 10:25:52 +08:00
• d887a89988 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new feature/new jinling.yang 2024-11-25 10:25:28 +08:00
• cb02319453 Accept Merge Request #1541: (feature/采购优化 -> develop) 禹翔辉 2024-11-25 09:20:26 +08:00
• 7f5f65f07f Merge branch 'feature/客供料入库单优化' into feature/采购优化 yuxianghui 2024-11-25 09:17:40 +08:00
• c45200aaee 采购单优化 yuxianghui 2024-11-25 09:04:41 +08:00
• d2351a67b0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-25 08:53:14 +08:00
• 52873021cb Accept Merge Request #1540: (feature/优化制造订单报废 -> develop) 杨金灵 2024-11-25 08:50:32 +08:00
• 3f276f4177 1、优化返工按钮；2、优化工单状态； yuxianghui 2024-11-22 17:57:18 +08:00
• f01a300aae 还原代码 jinling.yang 2024-11-22 17:56:59 +08:00
• 8e11ef6e72 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废 jinling.yang 2024-11-22 17:54:21 +08:00
• 52c0df9b83 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-22 17:51:52 +08:00
• 33b9c48e87 优化制造订单报废 jinling.yang 2024-11-22 17:51:40 +08:00
• aa2f562ca8 Accept Merge Request #1539: (feature/客供料入库单优化 -> develop) 禹翔辉 2024-11-22 09:53:39 +08:00