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

• 37cf4ca435 1、新增sf_oca模块 yuxianghui 2024-05-16 09:42:35 +08:00
• 1c441d388f 1、序列号模型添加Rfid字段的重复校验；功能刀具模型优化搜索视图的字段；优功能刀具组装流程的值 yuxianghui 2024-05-16 09:41:57 +08:00
• d244409d9c 处理物流处修改销售订单状态问题 mgw 2024-05-15 14:09:44 +08:00
• 1a66d6728e Accept Merge Request #1014: (feature/优化产品 -> develop) 禹翔辉 2024-05-14 15:57:26 +08:00
• 002c5c06b4 1、优化CNC加工流程 yuxianghui 2024-05-14 15:55:34 +08:00
• de62801ef1 Accept Merge Request #1013: (feature/优化产品 -> develop) 禹翔辉 2024-05-14 14:20:09 +08:00
• 62ec721c69 1 yuxianghui 2024-05-14 14:19:44 +08:00
• 2194374aa2 Merge branch 'feature/解决bug、优化权限' into feature/优化产品 yuxianghui 2024-05-14 14:11:39 +08:00
• eff6ce9f1b 1、关闭产品、采购单中关联字段的创建功能；2、优化采购入库验证条件； yuxianghui 2024-05-14 14:09:42 +08:00
• 9fcfaee8d1 Accept Merge Request #1012: (feature/销售订单列表倒序排序 -> develop) 杨金灵 2024-05-14 11:02:27 +08:00
• 90aae4dad9 销售订单按创建时间倒序 jinling.yang 2024-05-14 10:59:35 +08:00
• 934b59d213 坯料新增路线 jinling.yang 2024-05-14 10:51:38 +08:00
• ed9b575fb5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-13 14:04:30 +08:00
• bcd7ae9dd1 Accept Merge Request #1011: (feature/解决bug、优化权限 -> develop) 禹翔辉 2024-05-13 12:01:16 +08:00
• 48782cb62b Merge branch 'feature/解决主流程bug' into feature/解决bug、优化权限 yuxianghui 2024-05-13 11:55:55 +08:00
• 0f47f7c3b8 1、添加权限；2、设备的设备检修标准字段关闭创建功能；3、解决 销售经理创建报价单选择产品后没有把模型和价格带过去 的bug；4、关闭仓库创建按钮 yuxianghui 2024-05-13 11:54:03 +08:00
• d9f339c4b0 Merge branch 'feature/修复表面工艺外协' into develop jinling.yang 2024-05-13 09:25:44 +08:00
• d4b22d228b Accept Merge Request #1010: (feature/修复表面工艺外协 -> develop) 杨金灵 2024-05-13 09:24:12 +08:00
• e916e4e155 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺外协 jinling.yang 2024-05-12 21:33:57 +08:00
• 9dccee84c4 1.优化同一个产品多个制造订单的编程单合并到一张编程单和一个模型库至cloud jinling.yang 2024-05-12 21:33:43 +08:00
• 97ce5d81c8 Accept Merge Request #1009: (feature/制造代码优化 -> develop) 马广威 2024-05-12 13:16:40 +08:00
• c6638ac3f3 修复工单预计结束时间会取实际结束时间的问题 mgw 2024-05-12 13:14:53 +08:00
• 05e8507000 Accept Merge Request #1008: (feature/制造代码优化 -> develop) 马广威 2024-05-11 23:38:58 +08:00
• 1afc48a20e 去掉销售订单加工状态 mgw 2024-05-11 23:36:18 +08:00
• 053cd5fd89 Accept Merge Request #1007: (feature/制造代码优化 -> develop) 马广威 2024-05-11 22:44:30 +08:00
• 391a172016 修复制造订单加工无状态问题 mgw 2024-05-11 22:42:58 +08:00
• d3677b9c89 Accept Merge Request #1006: (feature/解决主流程bug -> develop) 禹翔辉 2024-05-11 16:41:01 +08:00
• 384b032ef3 Merge branch 'feature/解决坯料外协不生成外协出库单bug' into feature/解决主流程bug yuxianghui 2024-05-11 16:36:17 +08:00
• 0ddf2ce1bd 1、等待组件状态的装夹预调工单点击【开始】时，没有组件给提示信息；2、隐藏装夹预调工单列表看板，3、库存-内部调拨-产品是刀具物料除刀柄外，其他刀具物料目标货位添加必填校验； yuxianghui 2024-05-11 16:34:29 +08:00
• 05307fa25e Accept Merge Request #1005: (feature/修复表面工艺可选参数和模版类型 -> develop) 杨金灵 2024-05-11 15:42:31 +08:00
• 76b7d00643 1.模版类型的成品，坯料，表面工艺模版的工序新增过滤2.表面工艺可选参数的适用材料修改为可编辑 jinling.yang 2024-05-11 15:35:15 +08:00
• 0f8c4e8765 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-11 14:04:15 +08:00
• a1081fe8cc Merge branch 'feature/优化制造订单和编程' into develop jinling.yang 2024-05-11 14:03:31 +08:00
• 47ed09152d Accept Merge Request #1004: (feature/优化制造订单和编程 -> develop) 杨金灵 2024-05-11 14:02:09 +08:00
• 50dc25a8b7 还原注释代码 jinling.yang 2024-05-11 13:51:52 +08:00
• b80df25e0a 注释代码为第二期同一产品多个编程单需求 jinling.yang 2024-05-11 13:44:30 +08:00
• 999959b6a1 1.修复工件配送向导制造订单号能显示5个 2工件配送向导页面优化 3.生成制造订单同时工件配送默认路线 jinling.yang 2024-05-11 13:38:57 +08:00
• ec01b89242 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程 jinling.yang 2024-05-11 00:20:08 +08:00
• c932fa035a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-11 00:17:54 +08:00
• 2bffc5964a 1.1修复排程工件配送没有目的生产线2.注释获取cnc程序最新代码（第二期）3.优化部分页面 jinling.yang 2024-05-11 00:17:43 +08:00
• 7d7096a36c Accept Merge Request #1003: (feature/解决坯料外协不生成外协出库单bug -> develop) 禹翔辉 2024-05-10 16:45:56 +08:00
• 6c70f43b1b Merge branch 'feature/解决工单Rfid相关bug' into feature/解决坯料外协不生成外协出库单bug yuxianghui 2024-05-10 16:43:55 +08:00
• 016a279453 1、解决 坯料外协不生成外协出库单 的bug；2、添加工件装夹岗对sf.functional.cutting.tool.entity模型的查询权限 yuxianghui 2024-05-10 16:42:54 +08:00
• 52bbc6f6cd Accept Merge Request #1002: (feature/制造代码优化 -> develop) 马广威 2024-05-10 16:07:55 +08:00
• 1dfa890a4d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-05-10 16:06:51 +08:00
• d9543d42fd 在工单完成处控制状态，来避免非正常操作导致的制造订单状态异常问题 mgw 2024-05-10 16:01:33 +08:00
• b5c9387d8c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程 jinling.yang 2024-05-09 21:58:45 +08:00
• c4609e35a5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-09 18:29:45 +08:00
• 3d56e54fb2 优化制造订单的获取cnc程序 jinling.yang 2024-05-09 18:29:30 +08:00
• 494b6c69da Accept Merge Request #1001: (feature/制造代码优化 -> develop) 马广威 2024-05-09 14:52:39 +08:00
• e2d3b36683 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-05-09 14:51:42 +08:00
• 138e22255e 为工单预计时间增加初始值 mgw 2024-05-09 14:51:21 +08:00
• 7200d03733 Accept Merge Request #1000: (feature/前端样式修改 -> develop) 黄焱 2024-05-09 11:20:06 +08:00
• f3c98c9727 // 修改 【批量排程】【配送】 按钮UI 黄焱 2024-05-09 11:18:01 +08:00
• 6a4fd4d922 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程 jinling.yang 2024-05-09 11:11:16 +08:00
• 38298f4a32 Merge branch 'feature/优化agv调用中控接驳站接口' into develop jinling.yang 2024-05-09 11:08:17 +08:00
• 41603f4caa Accept Merge Request #999: (feature/优化agv调用中控接驳站接口 -> develop) 杨金灵 2024-05-09 11:08:02 +08:00
• 1a63f82f4b 优化agv调用中控接驳站接口 jinling.yang 2024-05-09 11:04:59 +08:00
• 0ea3d6f0b3 优化agv接驳站 jinling.yang 2024-05-09 11:04:07 +08:00
• 54a08802d9 修复装夹工单状态 jinling.yang 2024-05-09 10:45:14 +08:00
• 388b0b4e4c 优化制造 jinling.yang 2024-05-09 10:37:41 +08:00
• db7382826e Accept Merge Request #998: (feature/制造代码优化 -> develop) 马广威 2024-05-09 10:10:01 +08:00
• 07cf13dce7 sf_t切换数据库 mgw 2024-05-09 10:09:26 +08:00
• 28f4adb293 Accept Merge Request #997: (feature/制造代码优化 -> develop) 马广威 2024-05-09 09:45:07 +08:00
• ac3081d3bf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-05-09 09:44:23 +08:00
• 4e84562ba7 修复排程选择生产线bug mgw 2024-05-09 09:43:54 +08:00
• 72d59c11db Accept Merge Request #996: (feature/制造代码优化 -> develop) 马广威 2024-05-09 09:28:18 +08:00
• 8c279828be Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-05-09 09:25:19 +08:00
• 95a77574ae Accept Merge Request #995: (feature/解决工单Rfid相关bug -> develop) 马广威 2024-05-09 09:21:45 +08:00
• 5c68dd45ee 补充提交代码 mgw 2024-05-09 09:21:13 +08:00
• af822c9039 增加邮件发送公用类 mgw 2024-05-08 21:49:04 +08:00
• 92ea9b2a4f Merge branch 'feature/坯料采购-外协与自加工流程BUG' into feature/解决工单Rfid相关bug yuxianghui 2024-05-08 16:53:00 +08:00
• 5eacc01755 1、解决 装夹预调工单扫描Rfid码时提示语的制造订单号显示重复了 的缺陷， 添加工单扫描的Rfid不是托盘是其他物料的提示；2、解决刀具管理模块的菜单依赖问题；3、管理员添加货位的操作权限 yuxianghui 2024-05-08 16:50:13 +08:00
• 72ea4c8a2c Accept Merge Request #994: (feature/修复快速订单没有权限问题 -> develop) 杨金灵 2024-05-08 15:08:57 +08:00
• 4bea41b8fd 修复快速订单没有权限问题 jinling.yang 2024-05-08 15:07:31 +08:00
• f6373366b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-08 14:29:35 +08:00
• 339c6ec2ee Merge branch 'feature/优化模型上色路径' into develop jinling.yang 2024-05-08 14:29:19 +08:00
• e7ca8ebd9b Accept Merge Request #993: (feature/优化模型上色路径 -> develop) 杨金灵 2024-05-08 14:29:05 +08:00
• d964a9feb1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化模型上色路径 jinling.yang 2024-05-08 11:20:07 +08:00
• da139ad30b Accept Merge Request #992: (feature/修复工件配送rfidcode没有值 -> develop) 杨金灵 2024-05-08 09:33:15 +08:00
• 30053c5493 修复工件配送rfidcode没有值 jinling.yang 2024-05-08 09:27:24 +08:00
• fda43deeea 1.优化根据同一个产品，生成的制造订单绑定同一个编程单需求 jinling.yang 2024-05-07 17:33:23 +08:00
• cb5cfec82a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-07 15:17:10 +08:00
• 8b533475b8 Merge branch 'feature/采购去掉审核' into develop jinling.yang 2024-05-07 15:16:57 +08:00
• 7cbe1cb35d Accept Merge Request #991: (feature/采购去掉审核 -> develop) 杨金灵 2024-05-07 15:16:31 +08:00
• b8196cc4a9 1.修复销售岗位创建快速订单没有生成销售订单问题2.工件配送Tree视图默认上产线 jinling.yang 2024-05-07 14:44:58 +08:00
• ed41667477 1.采购去掉审核2.装夹预调工单验证优化 jinling.yang 2024-05-06 16:29:54 +08:00
• ca3cdd9132 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-06 14:17:16 +08:00
• 5551cc51e2 Accept Merge Request #990: (feature/修复工件配送 -> develop) 杨金灵 2024-05-06 11:51:54 +08:00
• 178edd645e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-06 11:49:11 +08:00
• 848fe9f2f0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送 jinling.yang 2024-05-06 11:48:53 +08:00
• 2cd666c4ae 优化agv及新增中控日志调用 jinling.yang 2024-05-06 11:48:34 +08:00
• 9d157d6083 处理工单可能为记录集的问题 mgw 2024-05-06 11:29:17 +08:00
• ab73deeeaa Accept Merge Request #989: (feature/添加人工编程标签 -> develop) 禹翔辉 2024-04-30 17:19:10 +08:00
• 68c4c18642 Merge branch 'feature/拆解单优化' into feature/添加人工编程标签 yuxianghui 2024-04-30 17:11:56 +08:00
• 402a4e1740 1、产品添加人工编程的筛选项；制造订单from视图添加人工编程字段； yuxianghui 2024-04-30 17:09:46 +08:00
• 68d8c36755 优化工件配送 jinling.yang 2024-04-30 17:05:09 +08:00
• b45ffcc0d2 1.优化工件配送向导2.增加rfid码字段 jinling.yang 2024-04-29 17:34:00 +08:00
• 58e1754ae2 Accept Merge Request #988: (feature/拆解单优化 -> develop) 马广威 2024-04-29 17:28:20 +08:00
• a1f0a580a6 解决 工具装夹岗在工件装夹单详情扫描rfid码报错 bug yuxianghui 2024-04-29 17:25:29 +08:00