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

• 22ccb095ee 需求计划下达计划 guanhuan 2025-07-07 10:46:27 +08:00
• bd6f35a16f 解决合并develop冲突 feature/20250604_chenye chenye 2025-07-07 10:03:09 +08:00
• 9db4ea745b Merge branch 'refs/heads/develop' into feature/物料需求计划管理 guanhuan 2025-07-04 17:03:23 +08:00
• 60fd4d4a73 需求计划下达计划 guanhuan 2025-07-04 17:01:56 +08:00
• 86bacee926 物料需求计划提交 chenye 2025-07-04 16:18:56 +08:00
• c6c4331c0b Accept Merge Request #2267: (feature/调拨单质检 -> develop) 禹翔辉 2025-07-04 13:49:35 +08:00
• 10c6f59f52 处理 成品出库单创建欠单后生成的调拨单详情页中质量检查智能按钮默认展示为通过状态 问题 feature/调拨单质检 yuxianghui 2025-07-04 13:48:16 +08:00
• df4995fa24 需求计划下达计划 guanhuan 2025-07-04 10:18:28 +08:00
• 6e877d0449 需求计划下达计划 guanhuan 2025-07-03 17:32:11 +08:00
• 3822d78f35 需求计划供货方式修改 guanhuan 2025-07-03 14:33:19 +08:00
• b23e50daa6 Accept Merge Request #2266: (feature/6711 -> develop) 胡尧 2025-07-02 17:32:14 +08:00
• 4615f1576f 解决采购申请创建的采购单取消后导致后续单据无法就绪的问题 feature/6711 胡尧 2025-07-02 17:31:43 +08:00
• e1644c3aa4 物料需求计划管理详情编辑需求练习 chenye 2025-07-02 16:19:24 +08:00
• 0350f78710 Merge branch 'refs/heads/develop' into feature/物料需求计划管理 guanhuan 2025-07-02 08:57:20 +08:00
• 20df1c0365 Accept Merge Request #2265: (release/release_2.15 -> develop) 胡尧 2025-07-01 17:57:16 +08:00
• 20069d5336 Merge branch refs/heads/develop into refs/heads/release/release_2.15 release/release_2.15 胡尧 2025-07-01 17:57:06 +08:00
• c8f1676de9 解决采购申请创建的采购单取消后导致调拨单不能就绪的问题 胡尧 2025-07-01 17:55:07 +08:00
• b267f2351d 需求计划开发 guanhuan 2025-07-01 14:34:27 +08:00
• fe8df494f9 需求计划列表字段位置变动 master master_sf_20250701_2.16 feature/新增坯料类型 guanhuan 2025-06-30 17:13:46 +08:00
• c31cc868a9 物料需求计划管理 guanhuan 2025-06-30 17:10:25 +08:00
• 0e7d6fac4e Accept Merge Request #2264: (feature/请购明细 -> develop) 禹翔辉 2025-06-30 15:20:56 +08:00
• 32cd68e15f 调拨动作中屏蔽验证 guanhuan 2025-06-30 13:36:04 +08:00
• 334d406c35 需求计划 guanhuan 2025-06-30 11:29:40 +08:00
• 70113cb3c5 采购申请批量转采购按钮显示优化 feature/请购明细 yuxianghui 2025-06-30 09:20:09 +08:00
• 048f07aba4 新增坯料类型 guanhuan 2025-06-27 17:44:32 +08:00
• f0e47371ed 新增坯料类型 guanhuan 2025-06-27 15:29:02 +08:00
• c03cda8250 物料需求计划管理 guanhuan 2025-06-27 15:23:05 +08:00
• 6dde814acc 产品-form页面加工参数 添加坯料类型字段 yuxianghui 2025-06-27 15:17:15 +08:00
• 71ab241e94 产品添加坯料类型字段，值来着bfm下单 yuxianghui 2025-06-27 15:10:15 +08:00
• 272e424975 Accept Merge Request #2263: (feature/采购订单-委外-坯料 -> develop) 禹翔辉 2025-06-27 10:17:42 +08:00
• 1fd9900e41 处理 由采购订单-委外加工类型生成的同一个补货组的坯料采购申请单据没有合并 问题 yuxianghui 2025-06-27 09:39:11 +08:00
• 50a066c23a 物料需求计划管理 guanhuan 2025-06-26 17:52:40 +08:00
• fe4659987f 物料需求计划管理 guanhuan 2025-06-26 17:18:03 +08:00
• 0a13acbb68 修改 销售订单确认时，生成产品BOM时校验单位用量值的提示信息 yuxianghui 2025-06-26 17:04:50 +08:00
• a68d6d4d06 处理 采购订单确认时，一补货组的补货单没有合并问题 yuxianghui 2025-06-26 16:55:38 +08:00
• c14e2c19bf 物料需求计划管理 guanhuan 2025-06-26 11:13:56 +08:00
• c630074f4a Accept Merge Request #2262: (feature/根据项目组区分sf代码 -> develop) 胡尧 2025-06-26 10:27:04 +08:00
• 4bea169327 撤回_run_manufacturing方法 feature/根据项目组区分sf代码 胡尧 2025-06-26 10:26:39 +08:00
• e2ddac4fb0 Accept Merge Request #2261: (feature/调拨单验证 -> develop) 禹翔辉 2025-06-26 10:24:21 +08:00
• e52ec3982f 调拨单验证时，对没有完成通过的质检单不进行出厂检验报告检测 yuxianghui 2025-06-26 10:03:19 +08:00
• 160bd117b7 Accept Merge Request #2260: (feature/根据项目组区分sf代码 -> develop) 胡尧 2025-06-26 09:35:42 +08:00
• a19cf5d894 解决冲突 胡尧 2025-06-26 09:35:26 +08:00
• 885064fb12 没有model_id的制造订单不请求编程 胡尧 2025-06-26 09:29:02 +08:00
• 8f7e785760 Accept Merge Request #2259: (feature/根据项目组区分sf代码 -> develop) 胡尧 2025-06-25 17:36:14 +08:00
• 8123885c71 修复加工面报错的问题 胡尧 2025-06-25 17:35:18 +08:00
• c2f346571d Accept Merge Request #2258: (feature/委外加工采购订单 -> develop) 禹翔辉 2025-06-25 16:13:04 +08:00
• e3494ce8b7 完成 委外加工采购订单增加BOM内物料的采购申请与采购订单 需求 yuxianghui 2025-06-25 16:09:32 +08:00
• 413cf43ea0 物料需求计划管理 guanhuan 2025-06-25 15:33:24 +08:00
• deda36a0f9 物料需求计划管理 guanhuan 2025-06-25 15:01:02 +08:00
• d75cff0a5d Accept Merge Request #2257: (feature/库存路线 -> develop) 禹翔辉 2025-06-25 14:37:28 +08:00
• 8a953a1417 Merge branch 'refs/heads/feature/库存路线' into feature/物料需求计划管理 guanhuan 2025-06-25 14:32:18 +08:00
• d046fd5298 移除销售订单供货方式确认 guanhuan 2025-06-25 14:22:27 +08:00
• 4b026535f8 修改固定列tree的传参方式 hyyy 2025-06-25 14:01:34 +08:00
• 28ade4ac72 完成 物料需求计划主数据准备：库存路线 需求 yuxianghui 2025-06-25 13:57:56 +08:00
• 9f00fddc09 物料需求计划管理 guanhuan 2025-06-25 09:57:19 +08:00
• 99ac89f995 需求-字段命名调整 hyyy 2025-06-25 09:54:37 +08:00
• 372f95d812 Accept Merge Request #2256: (feature/6711 -> develop) 胡尧 2025-06-25 09:43:11 +08:00
• f165bec662 待完工工单明细，控制时间为大于48小时，小于当前时间 胡尧 2025-06-25 09:42:53 +08:00
• 4099756d15 Accept Merge Request #2255: (feature/6711 -> develop) feature/7119_lxbTest 胡尧 2025-06-25 08:44:32 +08:00
• 133eac4a5c 日计划量对工单id去重 胡尧 2025-06-25 08:43:59 +08:00
• f41d3558d2 物料需求计划管理 guanhuan 2025-06-24 17:46:55 +08:00
• 91bad533c3 Accept Merge Request #2254: (feature/调拨验证优化 -> develop) 禹翔辉 2025-06-24 17:10:41 +08:00
• f5ed94866b 调拨单需验证质检单数量方法优化 yuxianghui 2025-06-24 16:59:38 +08:00
• b70f280c6e Accept Merge Request #2253: (feature/6711 -> develop) 胡尧 2025-06-24 15:56:52 +08:00
• 9922402b3b 修复明细接口bug 胡尧 2025-06-24 15:56:33 +08:00
• 152657e41b Accept Merge Request #2252: (feature/6711 -> develop) 胡尧 2025-06-24 15:51:17 +08:00
• 0a79a4e336 修改未完成订单明细的判断逻辑 胡尧 2025-06-24 15:50:45 +08:00
• 35b1d648c3 产品新增单件用量 unit_number 字段，值由bfm下单同步获得；产品生成的BOM中组件数量的值由unit_number 字段提供。 yuxianghui 2025-06-24 15:36:23 +08:00
• 174af13a58 Accept Merge Request #2251: (feature/6711 -> develop) 胡尧 2025-06-24 15:35:42 +08:00
• 00922e3674 修改工单状态对应名字 胡尧 2025-06-24 15:35:19 +08:00
• 832b06be1f Merge branch 'develop' into feature/根据项目组区分sf代码 胡尧 2025-06-24 15:06:31 +08:00
• 3b60db56de Accept Merge Request #2250: (feature/6711 -> develop) 胡尧 2025-06-24 14:52:47 +08:00
• 2a330a4bd8 修改大屏获取订单详情接口 胡尧 2025-06-24 14:52:03 +08:00
• 579b7138e7 需求 调拨单关联校验是否完成质量检查时，可先排除欠单量后再校验 开发 yuxianghui 2025-06-24 14:41:49 +08:00
• 98f8430c45 Revert "需求 调拨单关联校验是否完成质量检查时，可先排除欠单量后再校验 开发" yuxianghui 2025-06-24 14:32:40 +08:00
• 912847ae33 需求 调拨单关联校验是否完成质量检查时，可先排除欠单量后再校验 开发 yuxianghui 2025-06-24 14:32:21 +08:00
• 33647fa3e0 修改明细接口 胡尧 2025-06-24 14:18:27 +08:00
• d1f9f8cf8c Accept Merge Request #2249: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-24 11:44:41 +08:00
• 7d1f7b11eb 坯料尺寸显示修改 feature/齐套检查与下达生产 guanhuan 2025-06-24 11:39:47 +08:00
• fe3492ceb5 坯料尺寸显示修改 feature/坯料尺寸显示修改 guanhuan 2025-06-24 11:32:41 +08:00
• 02b4f76326 物料需求计划 guanhuan 2025-06-24 11:17:41 +08:00
• 72f737c370 Accept Merge Request #2248: (feature/6711 -> develop) 胡尧 2025-06-23 17:54:56 +08:00
• a2a652eea4 解决大屏bug 胡尧 2025-06-23 17:54:38 +08:00
• 2f26aee90a 物料需求计划 guanhuan 2025-06-23 17:21:50 +08:00
• 98c5b3b013 Accept Merge Request #2247: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-23 14:26:02 +08:00
• 0d76d1a7d3 需求计划修改 guanhuan 2025-06-23 13:59:37 +08:00
• b177bd95ff 将fetchCNC移动到sf_mrs_connect模块 胡尧 2025-06-23 11:04:44 +08:00
• a5bb686708 Accept Merge Request #2245: (feature/根据项目组区分sf代码 -> develop) 胡尧 2025-06-23 10:54:27 +08:00
• c1bafef1aa Merge branch 'develop' into feature/根据项目组区分sf代码 胡尧 2025-06-23 10:49:47 +08:00
• 46125dc44b Accept Merge Request #2244: (feature/6711 -> develop) 胡尧 2025-06-23 09:22:55 +08:00
• 05c5c0ef81 修复时间显示问题 胡尧 2025-06-23 09:22:37 +08:00
• d0d3215bf3 Accept Merge Request #2243: (feature/6711 -> develop) 胡尧 2025-06-23 09:11:51 +08:00
• 35e80266d7 修改日产量时间 胡尧 2025-06-23 08:59:02 +08:00
• 92a0c15708 Accept Merge Request #2242: (feature/委外加工bug修复 -> develop) 禹翔辉 2025-06-23 08:50:21 +08:00
• 0013f9f8c9 Merge branch 'feature/委外加工采购订单原生BUG修复' into feature/委外加工bug修复 yuxianghui 2025-06-23 08:34:14 +08:00
• 4274b9fe99 出厂检验报告-页脚修改回退 yuxianghui 2025-06-20 17:53:04 +08:00
• 149d8e287b Accept Merge Request #2241: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 17:44:00 +08:00
• 3f65742add 撤销出厂检验报告模版-页脚优化 yuxianghui 2025-06-20 17:42:39 +08:00
• b56e3545a1 Accept Merge Request #2239: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-20 17:37:21 +08:00
• fd7080a332 Accept Merge Request #2240: (feature/出厂检验报告模版 -> develop) 禹翔辉 2025-06-20 17:37:12 +08:00