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

• 85fb64ed55 页脚条件判断条件优化 yuxianghui 2025-06-20 17:36:12 +08:00
• 9ad06b4361 需求计划 guanhuan 2025-06-20 17:34:17 +08:00
• f9c13341e6 Merge branch 'refs/heads/develop' into feature/齐套检查与下达生产 guanhuan 2025-06-20 17:33:26 +08:00
• d2a61c79d0 需求计划 guanhuan 2025-06-20 17:29:41 +08:00
• 5f80b377e5 Accept Merge Request #2238: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 17:28:20 +08:00
• ab2e685004 添加页脚页码数据测试 yuxianghui 2025-06-20 17:24:48 +08:00
• dcc5eef006 需求计划 guanhuan 2025-06-20 17:21:06 +08:00
• 7e8b2adb3d 需求计划 guanhuan 2025-06-20 17:19:33 +08:00
• 9aa870065b Accept Merge Request #2237: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 17:03:52 +08:00
• 60c39929b2 页脚优化 yuxianghui 2025-06-20 17:02:31 +08:00
• 9a5b8a2627 Accept Merge Request #2236: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 16:56:08 +08:00
• 73696eb72c 出厂检验报告-页脚优化 yuxianghui 2025-06-20 16:50:59 +08:00
• 55babb8a35 Accept Merge Request #2235: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 16:42:02 +08:00
• 6682dbfb7d 出厂检验报告模版-页脚优化 yuxianghui 2025-06-20 16:40:38 +08:00
• e0b8e5fe07 Accept Merge Request #2234: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 16:19:18 +08:00
• 800f2eb6a7 出厂检验报告-页脚优化 yuxianghui 2025-06-20 16:03:13 +08:00
• 3cc633131e Accept Merge Request #2233: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 15:57:55 +08:00
• e3fb266890 出厂检验报告-页脚修改 yuxianghui 2025-06-20 15:55:58 +08:00
• 844f7de1ab Accept Merge Request #2232: (feature/6711 -> develop) 胡尧 2025-06-20 15:39:28 +08:00
• 13d33488dc 修改计划量字段为–qty_production 胡尧 2025-06-20 15:39:11 +08:00
• 266601cf84 Accept Merge Request #2231: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 15:36:51 +08:00
• 2e168a4ba7 出厂检验报告模版-页脚优化 yuxianghui 2025-06-20 15:35:07 +08:00
• 307e860fe0 增加提示模块 feature/7151 胡尧 2025-06-20 15:16:43 +08:00
• bd27f288f7 增加提示模块 胡尧 2025-06-20 15:16:25 +08:00
• 68ba47ed70 Accept Merge Request #2230: (feature/7151 -> develop) 胡尧 2025-06-20 15:03:57 +08:00
• 5bb6fcd4f7 修改依赖 胡尧 2025-06-20 15:03:42 +08:00
• 9a05bbd82c Accept Merge Request #2229: (feature/7151 -> develop) 胡尧 2025-06-20 14:52:34 +08:00
• b33c992b25 修改需求计划，下达生成的方法 胡尧 2025-06-20 14:51:58 +08:00
• 5947b3dfe9 回退出厂检验报告模版 yuxianghui 2025-06-20 14:26:29 +08:00
• 95e43b0fba Accept Merge Request #2228: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 14:07:56 +08:00
• e7afc76753 出厂检验报告模版优化 yuxianghui 2025-06-20 14:01:56 +08:00
• 788183e239 修改批量大小 胡尧 2025-06-20 13:52:37 +08:00
• 4ddabdefa1 Accept Merge Request #2227: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 13:39:42 +08:00
• 364127beb3 1 yuxianghui 2025-06-20 13:37:42 +08:00
• 109ea8729d 优化出厂检验报告模版 yuxianghui 2025-06-20 12:03:17 +08:00
• 32de726164 Accept Merge Request #2226: (feature/平台下单接口优化 -> develop) 禹翔辉 2025-06-20 11:49:32 +08:00
• 79f89f068b 修改出厂检验报告模版 yuxianghui 2025-06-20 11:47:59 +08:00
• 52189cff72 Accept Merge Request #2225: (feature/平台下单接口优化 -> develop) 禹翔辉 2025-06-20 11:37:18 +08:00
• aadccce47e 修改出厂检验报告生成模版 yuxianghui 2025-06-20 11:35:23 +08:00
• abd88fd721 Accept Merge Request #2224: (feature/6711 -> develop) 胡尧 2025-06-20 11:27:06 +08:00
• 2c2fa87719 修改产量接口bug 胡尧 2025-06-20 11:26:48 +08:00
• f38f60a6a8 计划增加队列 胡尧 2025-06-20 11:24:39 +08:00
• 7d8b7048a8 Accept Merge Request #2223: (feature/6711 -> develop) 胡尧 2025-06-20 11:15:58 +08:00
• e7b312fb22 去掉多余代码 胡尧 2025-06-20 10:53:31 +08:00
• bc641bde3a Accept Merge Request #2222: (feature/平台下单接口优化 -> develop) 禹翔辉 2025-06-20 10:30:25 +08:00
• d73ffab9b5 处理bfm下单报错 yuxianghui 2025-06-20 10:28:07 +08:00
• 4b1c0bc3b5 Accept Merge Request #2221: (feature/前端样式修改 -> develop) 黄焱 2025-06-20 09:23:34 +08:00
• 45730e2dd4 质检PDF预览logo移位 feature/前端样式修改 hyyy 2025-06-20 09:09:45 +08:00
• 8903f32cf8 Accept Merge Request #2220: (feature/质检按钮隐藏 -> develop) 禹翔辉 2025-06-19 16:34:32 +08:00
• 8bd1c8a095 处理 bfm内部下单包含坯料尺寸时，生成的产品的加工参数-体积数据不正确问题 yuxianghui 2025-06-19 16:29:31 +08:00
• abf9a0997b Accept Merge Request #2219: (feature/7154 -> develop) 谷耀东 2025-06-19 16:28:02 +08:00
• aec2d1c516 恢复刀具房样式和编码 feature/7154 guyaodong 2025-06-19 16:18:04 +08:00
• 127efb67d7 Accept Merge Request #2218: (feature/质检按钮隐藏 -> develop) 禹翔辉 2025-06-19 15:19:34 +08:00
• 78edf1f7eb 质检单按钮隐藏 yuxianghui 2025-06-19 15:17:26 +08:00
• e6e13a5970 Accept Merge Request #2217: (feature/6711 -> develop) 胡尧 2025-06-19 15:03:27 +08:00
• 55cc4906ef 修改大屏数据接口，日完成量统计,获取产线产量相关,获取工单明细 胡尧 2025-06-19 15:02:55 +08:00
• 427b548939 Accept Merge Request #2216: (feature/前端样式修改 -> develop) 黄焱 2025-06-19 14:37:13 +08:00
• 8c9db7e8c8 修改合格logo位置 hyyy 2025-06-19 14:32:59 +08:00
• 990f73ea4e Accept Merge Request #2215: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-19 11:21:12 +08:00
• d21e0c7fd9 修改大屏数据接口，支持线下数据 胡尧 2025-06-19 10:54:33 +08:00
• b4ed65a75c 物料需求计划增加字段显示 guanhuan 2025-06-19 10:37:35 +08:00
• 53ba2ec589 Accept Merge Request #2214: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-19 09:58:10 +08:00
• 566bc0e1e2 物料需求计划增加字段显示 guanhuan 2025-06-19 09:40:29 +08:00
• 5f216684f0 Accept Merge Request #2213: (feature/前端样式修改 -> develop) 黄焱 2025-06-18 18:00:26 +08:00
• e86bd59a43 修改出厂检验报告合格LOGO移位 hyyy 2025-06-18 17:56:27 +08:00
• e55625e4b6 Accept Merge Request #2212: (feature/处理sf.t更新报错 -> develop) 禹翔辉 2025-06-18 17:02:57 +08:00
• 790dd3dd05 销售订单行的交货截止日期改为客户交期 yuxianghui 2025-06-18 17:00:16 +08:00
• 84846fb3da bfm内部下单新增坯料长宽高同步到sf产品-加工参数-坯料尺寸的长宽高 yuxianghui 2025-06-18 16:54:15 +08:00
• f45a46255b Accept Merge Request #2211: (feature/处理sf.t更新报错 -> develop) 禹翔辉 2025-06-18 16:12:12 +08:00
• fe5b005e45 1 yuxianghui 2025-06-18 16:11:49 +08:00
• fc33280509 处理sf.t更新报错 yuxianghui 2025-06-18 16:09:44 +08:00
• 60ed04cf77 Accept Merge Request #2208: (feature/前端样式修改 -> develop) 黄焱 2025-06-18 15:47:36 +08:00
• 3439b47b0c Accept Merge Request #2206: (feature/删除客户交期字段 -> develop) 禹翔辉 2025-06-18 15:45:32 +08:00
• 33c5d648b5 Accept Merge Request #2210: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-18 15:41:54 +08:00
• c7b50d9706 Accept Merge Request #2209: (feature/7141 -> develop) 谷耀东 2025-06-18 15:41:44 +08:00
• 05caed1d91 批量排程时间修改 guanhuan 2025-06-18 14:49:35 +08:00
• 8b66fda899 增加kanban悬停tip feature/7141 guyaodong 2025-06-18 14:26:53 +08:00
• 1456d4303b 修改需求计划模块需求与bug hyyy 2025-06-18 14:18:37 +08:00
• 9d2f23de7c 批量排程时间修改 guanhuan 2025-06-18 14:05:23 +08:00
• 9393a48e70 删除客户交期字段 yuxianghui 2025-06-18 11:11:51 +08:00
• 749f44d6df Accept Merge Request #2205: (feature/7134 -> develop) 胡尧 2025-06-18 10:56:54 +08:00
• 4f000a6be4 修改采购申请相关欠单创建报错的问题 feature/7134 胡尧 2025-06-18 10:56:22 +08:00
• 71a0f39ec9 新增如果采购订单类型为委外加工，则不进行供应商校验直接生成补给单 yuxianghui 2025-06-18 10:50:13 +08:00
• 7af7079a5c Accept Merge Request #2204: (feature/7134 -> develop) 胡尧 2025-06-18 10:34:57 +08:00
• 376eb9e56f 采购申请按钮按照产品以及bom产品过滤 胡尧 2025-06-18 10:34:34 +08:00
• 531bc2e090 Accept Merge Request #2203: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-18 09:44:16 +08:00
• bc3ab21d75 打印列表程序单数据修改 guanhuan 2025-06-18 09:40:12 +08:00
• 92f591c3e7 将sf_manufacturing模块中stock.py的_run_manufacture方法进行拆分 胡尧 2025-06-18 09:25:44 +08:00
• d1811ea24b 需齐套检查修改 guanhuan 2025-06-17 16:33:01 +08:00
• b426d5d505 需求计划排序修改 guanhuan 2025-06-17 14:58:27 +08:00
• 1dfa22900d Accept Merge Request #2202: (feature/质检样式修改 -> develop) 禹翔辉 2025-06-17 11:50:01 +08:00
• 0eeebf437a 1、质检单类型为出厂检测报告时，隐藏通过状态下的不合格按钮；2、功能刀具组装检测BOM物料时过滤产品的追溯类型为不追溯的产品。 yuxianghui 2025-06-17 11:47:26 +08:00
• 397d4f29a1 Accept Merge Request #2201: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-17 11:21:00 +08:00
• 33205c5d29 不同产品调拨单就绪未过滤产品问题 guanhuan 2025-06-17 10:57:13 +08:00
• 568f3e4f30 修改传参，增加提示，默认展示第一个文件 hyyy 2025-06-17 09:58:53 +08:00
• 8c43fc2b76 打印方法修改 guanhuan 2025-06-17 09:41:08 +08:00
• 8960d3d07c Merge remote-tracking branch 'origin/feature/齐套检查与下达生产' into feature/齐套检查与下达生产 guanhuan 2025-06-16 17:42:40 +08:00
• 95b5c86242 投料齐套检查修改 guanhuan 2025-06-16 17:42:05 +08:00
• 61034c3424 调整数据获取逻辑 胡尧 2025-06-16 17:33:55 +08:00
• c2000aa9c5 修改字段名 hyyy 2025-06-16 17:28:09 +08:00