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

• 89a2260adc 日志修改 liaodanlong 2025-03-24 15:16:55 +08:00
• c5ad94c5f3 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-24 14:56:16 +08:00
• 02e0a792d4 Accept Merge Request #1959: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-24 14:55:24 +08:00
• e6d54a3eba 调拨单零件图号零件名称计算逻辑 错误处理 liaodanlong 2025-03-24 14:53:33 +08:00
• 43c6686240 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-24 14:29:47 +08:00
• 9b73ae26e8 Accept Merge Request #1958: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-24 14:28:44 +08:00
• a0606842e5 过滤错误 liaodanlong 2025-03-24 14:26:53 +08:00
• d014ba980b 过滤错误 liaodanlong 2025-03-24 14:25:19 +08:00
• 5c35eae859 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-24 14:03:21 +08:00
• 9df76253de Accept Merge Request #1957: (feature/制造功能优化 -> develop) 马广威 2025-03-24 14:02:16 +08:00
• 8ba71ea8af 恢复按钮控制 mgw 2025-03-24 14:01:35 +08:00
• fde28bed8a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-24 13:54:14 +08:00
• 8fed12f7bb Accept Merge Request #1956: (feature/制造功能优化 -> develop) 马广威 2025-03-24 13:52:46 +08:00
• 489d7030f4 调整按钮显隐逻辑 mgw 2025-03-24 13:52:08 +08:00
• 16ae845ad9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-24 13:41:39 +08:00
• 2c1d90ae63 Accept Merge Request #1955: (feature/制造功能优化 -> develop) 马广威 2025-03-24 13:40:20 +08:00
• 8e21434fba Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-24 13:39:46 +08:00
• 956cefbd9f 调整按钮显隐 mgw 2025-03-24 13:39:19 +08:00
• 85789d137b 修复线上pdf版本报告变形 mgw 2025-03-24 13:35:43 +08:00
• 6e731cfadc Accept Merge Request #1954: (feature/采购申请自动确认 -> develop) 禹翔辉 2025-03-24 13:17:57 +08:00
• f51f8bebb2 新增按规格生成的采购申请订单跳过审核环节自动更新为已批准状态 yuxianghui 2025-03-24 13:16:02 +08:00
• e10648ad07 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-24 11:13:48 +08:00
• 2bd18def8f Accept Merge Request #1953: (feature/mrp_bug_fixed -> develop) 胡尧 2025-03-24 11:13:10 +08:00
• 61b2b05367 修改采购单需要审批提醒的方式 胡尧 2025-03-24 11:11:50 +08:00
• d2b02bb6f7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-24 11:03:07 +08:00
• e7b4f51736 Accept Merge Request #1952: (feature/制造功能优化 -> develop) 马广威 2025-03-24 11:02:08 +08:00
• 8832b01408 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-24 11:01:11 +08:00
• a5c5b499f1 调整报告样式 mgw 2025-03-24 11:00:49 +08:00
• 0e1c44c3ac Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-24 09:56:19 +08:00
• 4212ed763b Accept Merge Request #1951: (feature/mrp_bug_fixed -> develop) 胡尧 2025-03-24 09:54:48 +08:00
• a6ac46617d 取消物流单屏蔽 胡尧 2025-03-24 09:54:04 +08:00
• 43ba241b42 增加采购申请翻译 胡尧 2025-03-24 09:51:05 +08:00
• 5ffbe4c6fc Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 胡尧 2025-03-24 09:00:22 +08:00
• 5ae167c133 去掉取消自动加工原因 胡尧 2025-03-24 09:00:16 +08:00
• 0702e1dd51 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-21 18:26:58 +08:00
• d9d434d994 Accept Merge Request #1950: (feature/制造功能优化 -> develop) 马广威 2025-03-21 18:26:18 +08:00
• 08fa26d9c8 调整报告样式 mgw 2025-03-21 18:25:20 +08:00
• e861897527 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-21 18:18:29 +08:00
• 4ba3a56794 Accept Merge Request #1949: (feature/制造功能优化 -> develop) 马广威 2025-03-21 18:17:32 +08:00
• 4c995d00d0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-21 18:16:18 +08:00
• 30b01b6e2c 增加已批准为无异动 mgw 2025-03-21 18:15:37 +08:00
• 19a66d2c81 屏蔽物流下单按钮 胡尧 2025-03-21 16:44:49 +08:00
• b2b9120577 Accept Merge Request #1948: (feature/零件图号字段优化 -> develop) 禹翔辉 2025-03-21 16:14:32 +08:00
• ad8f63570d 请购明细添加供货方式搜索 yuxianghui 2025-03-21 16:10:30 +08:00
• 3bb909c2ee Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-21 15:39:56 +08:00
• e8b22cedea Accept Merge Request #1947: (feature/零件图号字段优化 -> develop) 禹翔辉 2025-03-21 15:39:00 +08:00
• d202e7ee93 零件名称字段计算方法修改 yuxianghui 2025-03-21 15:37:10 +08:00
• da19b86bf5 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-21 15:29:49 +08:00
• 2876d56803 Accept Merge Request #1946: (feature/mrp_bug_fixed -> develop) 胡尧 2025-03-21 15:29:22 +08:00
• e1fd4c465e 销售订单自动确认 胡尧 2025-03-21 15:27:11 +08:00
• dc318769af Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-21 15:13:28 +08:00
• 31820dfef1 Accept Merge Request #1945: (feature/采购申请字段调整 -> develop) 禹翔辉 2025-03-21 15:07:48 +08:00
• 1cb46bb1e1 Merge branch 'feature/采购申请代码搬迁' into feature/采购申请字段调整 yuxianghui 2025-03-21 15:06:29 +08:00
• 80e9085e29 采购申请字段调整 yuxianghui 2025-03-21 15:05:42 +08:00
• 311b95bca5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-21 13:18:22 +08:00
• d1f8bdb1f4 Accept Merge Request #1944: (feature/制造功能优化 -> develop) 马广威 2025-03-21 13:17:11 +08:00
• 08267ba1e6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-21 13:16:18 +08:00
• c6f1bc80a7 调整原有质检单图纸获取逻辑 mgw 2025-03-21 13:15:59 +08:00
• 384761514b Accept Merge Request #1943: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-21 11:34:57 +08:00
• 80118b61c2 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-21 11:24:02 +08:00
• eab3ba9478 Accept Merge Request #1942: (feature/采购申请代码搬迁 -> develop) 禹翔辉 2025-03-21 11:23:27 +08:00
• c2be45f204 Merge branch 'feature/采购单优化' into feature/采购申请代码搬迁 yuxianghui 2025-03-21 11:21:08 +08:00
• 86d2fb1ac2 efms-purchase_request模块新增修改代码搬迁到sf-jikimo_purchase_request模块 yuxianghui 2025-03-21 11:20:24 +08:00
• f28d07e58f Accept Merge Request #1941: (feature/采购单优化 -> develop) 禹翔辉 2025-03-20 17:03:28 +08:00
• 7124eebabe 采购单采购类型计算方法添加新判断条件 yuxianghui 2025-03-20 17:01:36 +08:00
• 94d0c14e1f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-20 16:23:01 +08:00
• 9f3791bd6b Accept Merge Request #1940: (feature/制造功能优化 -> develop) 马广威 2025-03-20 16:21:05 +08:00
• ae1028972c sf-坯料的获取方式是自加工，生成的坯料制造订单的排程单不在取消列表中 mgw 2025-03-20 16:19:55 +08:00
• 3f6f9bb709 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-20 15:44:11 +08:00
• b86d15c5cb Accept Merge Request #1939: (feature/制造功能优化 -> develop) 马广威 2025-03-20 15:43:17 +08:00
• 52e68ffa4c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-20 15:41:49 +08:00
• f85f614190 质检标准类型是出厂检验报告时可以更换控制方式-需要增加校验 mgw 2025-03-20 15:41:10 +08:00
• 2da22d5f19 Accept Merge Request #1938: (feature/销售_采购申请优化 -> develop) 禹翔辉 2025-03-20 15:37:55 +08:00
• 98644a4b57 调整加工订单匹配条件 mgw 2025-03-20 15:34:17 +08:00
• 6c879e4af3 1、新增由销售单生成的采购申请自动确认；2、销售单新增【采购申请】跳转按钮 yuxianghui 2025-03-20 15:20:05 +08:00
• cf060d0d6c 自加工坯料制造订单的调拨单零件图号零件名称赋值 liaodanlong 2025-03-20 10:24:34 +08:00
• 49a1ec353a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-20 08:49:47 +08:00
• 134c68abc8 Accept Merge Request #1937: (feature/制造功能优化 -> develop) 马广威 2025-03-20 08:48:23 +08:00
• d6a7a3c919 取消发布增加二次确认；发布状态隐藏 mgw 2025-03-20 08:45:40 +08:00
• b89cfb899b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 15:44:21 +08:00
• db661e76f5 Accept Merge Request #1935: (feature/制造功能优化 -> develop) 马广威 2025-03-19 15:43:09 +08:00
• bf8ff7199e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-19 15:42:20 +08:00
• 0ff0cc5fbd Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-19 15:41:51 +08:00
• 813939a6c2 Accept Merge Request #1936: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-19 15:41:02 +08:00
• 221e25f581 【合金牌号】，【材料应用】字段同步 liaodanlong 2025-03-19 15:33:06 +08:00
• e4ed431167 Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-19 15:32:07 +08:00
• 1a511b93cf 调整名称及总数量逻辑 mgw 2025-03-19 15:31:34 +08:00
• 9093770ce1 修改取消列表，修改出厂检验报告 hyyy 2025-03-19 14:45:04 +08:00
• 37173968fd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 13:18:42 +08:00
• a75e236f1f Accept Merge Request #1934: (feature/制造功能优化 -> develop) 马广威 2025-03-19 13:17:50 +08:00
• e1177a44e8 当调拨单完成后，重新发布才重新写入到加工订单明细 mgw 2025-03-19 13:17:15 +08:00
• 470482b7e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 13:06:52 +08:00
• 27702fe46e Accept Merge Request #1933: (feature/制造功能优化 -> develop) 马广威 2025-03-19 13:06:02 +08:00
• 8c793c6ad9 调整检验数边界值 mgw 2025-03-19 13:04:19 +08:00
• 0b067f9999 原材料的调拨单缺少零件图号零件名称 liaodanlong 2025-03-19 12:59:16 +08:00
• 5b51cc3de4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 12:55:23 +08:00
• 625188d46d Accept Merge Request #1932: (feature/制造功能优化 -> develop) 马广威 2025-03-19 12:54:18 +08:00
• 6178ad0f8e 修改取消明细状态 mgw 2025-03-19 12:53:40 +08:00
• 9e939467e5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-19 11:35:27 +08:00
• 6c89a2c4fb Accept Merge Request #1931: (feature/制造功能优化 -> develop) 马广威 2025-03-19 11:34:38 +08:00