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

• 7d986fe139 Accept Merge Request #2091: (feature/6694 -> develop) 胡尧 2025-05-07 13:02:51 +08:00
• fffbfc21c2 表面工艺外协工单流程数量按照制造订单的product_uom_qty设置 胡尧 2025-05-07 13:02:13 +08:00
• 6451bfbc42 Accept Merge Request #2090: (feature/6694 -> develop) 胡尧 2025-05-07 11:01:51 +08:00
• 5aa848de53 修改判断坯料序列号的逻辑 胡尧 2025-05-07 11:01:01 +08:00
• efc4ae31c9 工艺外协代码 liaodanlong 2025-05-07 11:00:32 +08:00
• 0863238819 Merge branch 'refs/heads/develop' into feature/tool_standard_library_process liaodanlong 2025-05-07 11:00:24 +08:00
• 4f181e5eba Accept Merge Request #2089: (feature/6694 -> develop) 胡尧 2025-05-07 08:52:19 +08:00
• 2bf43ae9a1 将成品的追溯复制到product上，将坯料的追溯同成品的追组 胡尧 2025-05-07 08:47:33 +08:00
• d98d04d4ed Accept Merge Request #2088: (feature/6694 -> develop) 胡尧 2025-05-06 15:23:05 +08:00
• 602d6678bc Merge branch 'develop' into feature/6694 胡尧 2025-05-06 15:22:08 +08:00
• 8fd0c4e1f1 修复计算当前货位的逻辑，减少循环次数 胡尧 2025-05-06 15:21:45 +08:00
• 514fd79c3e Accept Merge Request #2087: (feature/采购申请优化 -> develop) 管欢 2025-04-29 13:58:19 +08:00
• 95c25ac7b8 工艺外协代码 liaodanlong 2025-04-29 13:39:36 +08:00
• 21d052e222 采购申请明细优化 guanhuan 2025-04-29 10:40:19 +08:00
• 95e2c2db0d Accept Merge Request #2086: (feature/6694 -> develop) release/release_2.12 胡尧 2025-04-29 10:11:16 +08:00
• 17a29b7b29 修改打印逻辑，先找默认打印机，未找到则直接返回 胡尧 2025-04-29 10:09:41 +08:00
• dd745423a1 修改打印逻辑，先找默认打印机，未找到则直接返回 胡尧 2025-04-29 10:03:09 +08:00
• a534e5f400 Accept Merge Request #2085: (feature/6694 -> develop) master_sf_20250428_2.13 胡尧 2025-04-28 19:29:01 +08:00
• 4dc7b5857e 删除多余的打印代码 胡尧 2025-04-28 19:28:31 +08:00
• dc679c46cc Accept Merge Request #2084: (feature/6694 -> develop) 胡尧 2025-04-28 19:18:26 +08:00
• 8ccf6cc365 简化打印代码 胡尧 2025-04-28 19:18:02 +08:00
• f8457ae66b Accept Merge Request #2083: (feature/6694 -> develop) 胡尧 2025-04-28 19:12:31 +08:00
• 12c8641f2e 简化打印代码 胡尧 2025-04-28 19:12:08 +08:00
• f42938f668 Accept Merge Request #2082: (feature/6694 -> develop) 胡尧 2025-04-28 18:28:49 +08:00
• a856c5cbf7 增加打印日志 胡尧 2025-04-28 18:28:21 +08:00
• 6411e79904 Accept Merge Request #2081: (feature/6694 -> develop) 胡尧 2025-04-28 16:42:39 +08:00
• 946f08c479 增加日志 胡尧 2025-04-28 16:42:20 +08:00
• 4a198639ec Accept Merge Request #2080: (feature/6694 -> develop) 胡尧 2025-04-28 15:47:42 +08:00
• 234812bb40 Merge branch 'develop' into feature/6694 胡尧 2025-04-28 15:47:15 +08:00
• dd43e31c3c 修改打印pdf数据 胡尧 2025-04-28 15:46:35 +08:00
• 2f5b0281c3 Accept Merge Request #2079: (feature/process_outsourcing_code_stripping -> develop) 廖丹龙 2025-04-28 15:26:22 +08:00
• d4cf2a9d17 Merge remote-tracking branch 'origin/release/release_2.12' into release/release_2.12 feature/process_outsourcing_code_stripping liaodanlong 2025-04-28 09:43:49 +08:00
• ecf5dcf2f2 sf .r-采购-采购订单-坯料委外加工生成的采购申请创建采购订单的类型不正确 liaodanlong 2025-04-28 09:43:25 +08:00
• 848e8a5fa8 merge branch 'develop' into release/release_2.12 胡尧 2025-04-28 09:12:50 +08:00
• cc38383e32 Accept Merge Request #2078: (feature/6694 -> develop) 胡尧 2025-04-28 09:12:31 +08:00
• 39de4e5ea1 修复bug 胡尧 2025-04-28 09:12:09 +08:00
• 8b6c904dae Merge branch 'develop' into release/release_2.12 胡尧 2025-04-28 08:57:10 +08:00
• a63f2d28f6 Accept Merge Request #2077: (feature/6694 -> develop) 胡尧 2025-04-28 08:56:49 +08:00
• 08812f169e Merge remote-tracking branch 'origin/release/release_2.12' into release/release_2.12 liaodanlong 2025-04-27 17:20:40 +08:00
• ce79016bef 返工未申请重新编程，新工单复制程序文件问题处理 liaodanlong 2025-04-27 17:20:15 +08:00
• fef960f7e8 修改字体获取目录 胡尧 2025-04-27 16:29:39 +08:00
• 425c9fb64b Merge branch 'develop' into release/release_2.12 胡尧 2025-04-27 15:32:52 +08:00
• fc9a58c0c3 Accept Merge Request #2076: (feature/6694 -> develop) 胡尧 2025-04-27 15:32:31 +08:00
• ed90ad34e6 退回字体处理 胡尧 2025-04-27 15:32:08 +08:00
• 5662094ec4 Accept Merge Request #2075: (feature/6694 -> develop) 胡尧 2025-04-27 15:25:42 +08:00
• 404c56e134 屏蔽删除文件代码 胡尧 2025-04-27 15:24:28 +08:00
• 9ee614aa10 Accept Merge Request #2074: (feature/6694 -> develop) 胡尧 2025-04-27 15:11:46 +08:00
• 57789dc5a5 修改上传ftp代码 胡尧 2025-04-27 15:10:22 +08:00
• 52d436909b Merge branch 'develop' into release/release_2.12 胡尧 2025-04-27 14:37:18 +08:00
• 3a760a66e1 Accept Merge Request #2073: (feature/6694 -> develop) 胡尧 2025-04-27 14:36:57 +08:00
• 72415d633c 退回字体修改 胡尧 2025-04-27 14:36:13 +08:00
• 5c67a8c190 Accept Merge Request #2072: (feature/6694 -> develop) 胡尧 2025-04-27 14:27:08 +08:00
• 46ba682848 修改验证规则 胡尧 2025-04-27 14:26:31 +08:00
• 6b38062e87 解决冲突 胡尧 2025-04-27 14:15:26 +08:00
• 0945754736 Accept Merge Request #2071: (feature/6694 -> develop) 胡尧 2025-04-27 14:13:45 +08:00
• 644ff967e5 解决pdf上数字乱码的问题 胡尧 2025-04-27 14:10:29 +08:00
• 5f79d2038c 工艺外协采购单展示问题 liaodanlong 2025-04-27 11:49:56 +08:00
• defd779279 返工 不重新编程 cnc加工工单没有数据问题 liaodanlong 2025-04-27 11:35:29 +08:00
• e2e820267e 字符串拼接问题处理 liaodanlong 2025-04-27 11:04:09 +08:00
• 94f179a6d6 工艺外协代码回退 liaodanlong 2025-04-27 10:46:48 +08:00
• bf9f4c1276 工艺外协代码回退 liaodanlong 2025-04-27 10:20:45 +08:00
• 51a633594f 工艺外协代码回退 liaodanlong 2025-04-27 09:24:39 +08:00
• 7d7c7b0fcf 工艺外协代码回退 liaodanlong 2025-04-27 09:09:48 +08:00
• d88ac22b7c Merge branch 'refs/heads/develop' into release/release_2.12 liaodanlong 2025-04-27 09:02:27 +08:00
• 1f4e1c11c8 Accept Merge Request #2070: (feature/process_outsourcing_code_stripping -> develop) 廖丹龙 2025-04-27 09:00:49 +08:00
• 9f1beb4013 Merge remote-tracking branch 'origin/develop' into develop liaodanlong 2025-04-27 08:50:45 +08:00
• f864466987 Merge branch 'refs/heads/feature/process_outsourcing_code_stripping' into develop liaodanlong 2025-04-27 08:49:13 +08:00
• 9cf70cc54c 工艺外协代码回退 liaodanlong 2025-04-26 14:42:38 +08:00
• 82bd50cb97 修改文件传输规则 胡尧 2025-04-25 17:30:51 +08:00
• 4bce26721d Merge branch 'develop' into release/release_2.12 胡尧 2025-04-25 16:41:08 +08:00
• 3fb4e7c413 Accept Merge Request #2069: (feature/6694 -> develop) 胡尧 2025-04-25 16:40:24 +08:00
• a7ab8679f4 调整字体大小 胡尧 2025-04-25 16:39:51 +08:00
• 65c67775fa Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 feature/制造功能优化 mgw 2025-04-25 16:10:09 +08:00
• 8f2d214854 出厂检验报告发布时二次确认 mgw 2025-04-25 16:09:50 +08:00
• ca9a91e30a 修改程序单二维码下方文字 胡尧 2025-04-25 16:07:34 +08:00
• 314d738412 接口授权 胡尧 2025-04-25 15:59:11 +08:00
• 699e03ccda Accept Merge Request #2068: (release/release_2.12 -> develop) 胡尧 2025-04-25 15:58:27 +08:00
• 8f0ade7b43 Accept Merge Request #2067: (feature/页面显示优化 -> develop) 管欢 2025-04-25 15:55:38 +08:00
• 50bc8786e8 解决冲突 胡尧 2025-04-25 15:50:40 +08:00
• 0777e63bc7 修复字符集出错的问题 胡尧 2025-04-25 15:49:41 +08:00
• 128bebf338 紧急采购默认为是 feature/页面显示优化 guanhuan 2025-04-25 14:57:56 +08:00
• 7a71077aa7 Accept Merge Request #2066: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-04-25 14:41:01 +08:00
• 10a1d43a17 排程 liaodanlong 2025-04-25 14:39:58 +08:00
• 87d351e9e9 Accept Merge Request #2065: (feature/6694 -> develop) 胡尧 2025-04-25 14:09:36 +08:00
• d2daae1a8f 增加接口授权 胡尧 2025-04-25 14:09:13 +08:00
• 5997c24895 Accept Merge Request #2064: (feature/6694 -> develop) 胡尧 2025-04-25 14:05:10 +08:00
• df53989f22 增加传输文件列表返回 胡尧 2025-04-25 14:04:48 +08:00
• 9bab687080 Accept Merge Request #2063: (feature/6609 -> develop) 胡尧 2025-04-25 13:45:29 +08:00
• a5ac8b8b84 修改机台二维码为机台编码 胡尧 2025-04-25 13:40:18 +08:00
• 2cde398e11 Accept Merge Request #2062: (feature/6609 -> develop) 胡尧 2025-04-25 13:38:29 +08:00
• 88026fea5d 修改机台二维码为机台编码 胡尧 2025-04-25 13:37:12 +08:00
• 443a21a0cc 工序外协需求 liaodanlong 2025-04-25 11:46:05 +08:00
• e14646a6fc Accept Merge Request #2061: (feature/制造功能优化 -> develop) 马广威 2025-04-25 11:35:31 +08:00
• 6a920be6d1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-04-25 11:34:51 +08:00
• 3811079a7f 调整alarm_start_time为时间戳 mgw 2025-04-25 11:34:34 +08:00
• ad8e0b6af0 调整当日故障时长取值 mgw 2025-04-25 11:25:38 +08:00
• 04cb910803 Accept Merge Request #2060: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-04-25 11:18:43 +08:00
• 42292818af Merge branch 'refs/heads/develop' into feature/tool_standard_library_process liaodanlong 2025-04-25 11:17:48 +08:00
• bcafd9cf38 【sf.t-计划】在排程单详情页选择时间段进行排程时未校验日历有效工作时间 liaodanlong 2025-04-25 11:16:23 +08:00
• 12ebd87f1d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-04-25 10:14:00 +08:00