jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jikimo:feature/6679
Branches Tags
jikimo:master jikimo:feature/7230 jikimo:feature/7229 jikimo:feature/物料需求计划管理 jikimo:feature/7277_7280 jikimo:develop jikimo:feature/7248 jikimo:feature/7254_new jikimo:feature/7254 jikimo:feature/增加模块完整性验证 jikimo:feature/7280 jikimo:feature/7253 jikimo:feature/7277 jikimo:feature/7249 jikimo:feature/7231 jikimo:feature/禁止负库存 jikimo:feature/新增plm模块 jikimo:feature/20250604_chenye jikimo:feature/调拨单质检 jikimo:feature/6711 jikimo:release/release_2.15 jikimo:feature/新增坯料类型 jikimo:feature/请购明细 jikimo:feature/根据项目组区分sf代码 jikimo:feature/7119_lxbTest jikimo:feature/齐套检查与下达生产 jikimo:feature/坯料尺寸显示修改 jikimo:feature/7151 jikimo:feature/前端样式修改 jikimo:feature/7154 jikimo:feature/7141 jikimo:feature/7134 jikimo:feature/修改产品名称 jikimo:feature/6973 jikimo:hotfix/修复刀具预警没有预警记录和通知 jikimo:release/release_2.14 jikimo:hotfix/备注为空 jikimo:feature/需求计划 jikimo:feature/搜索优化 jikimo:feature/6694 jikimo:feature/pre-three-elment jikimo:feature/merge-6694 jikimo:feature/backup-develop jikimo:feature/tool_standard_library_process jikimo:release/release_2.13 jikimo:feature/采购申请优化 jikimo:feature/sync-develop-with-master jikimo:release/release_2.12 jikimo:feature/process_outsourcing_code_stripping jikimo:feature/制造功能优化 jikimo:feature/页面显示优化 jikimo:feature/6763 jikimo:feature/6684 jikimo:hotfix/解决采购申请bug jikimo:release/release_2.11 jikimo:feature/6679 jikimo:feature/6686 jikimo:release/release_2.10 jikimo:feature/mrp_bug_fixed jikimo:feature/commercially_launched jikimo:feature/零件图号筛选 jikimo:feature/优化调拨列表 jikimo:release/release_2.9 jikimo:feature/合同审批 jikimo:feature/取消加工订单 jikimo:feature/工单返工优化 jikimo:feature/报废优化 jikimo:feature/customer_supply jikimo:feature/验证合并的逻辑 jikimo:release/release_2.8 jikimo:feature/修改制造订单列表显示 jikimo:feature/增加质检模块 jikimo:feature/加工能力显示重叠 jikimo:feature/零件图号名称优化需求 jikimo:feature/part_number jikimo:release/release_2.7 jikimo:feature/消息提醒优化 jikimo:feature/sale_order_route_pick jikimo:feature/customer_material_optimization jikimo:feature/逾期工单批量重新安排 jikimo:feature/delivery_status jikimo:feature/manufactur_order jikimo:release/release_2.6 jikimo:feature/new111 jikimo:feature/model_type_update jikimo:feature/new1 jikimo:feature/new jikimo:feature/10月迭代优化 jikimo:feature/销售和排程添加消息推送 jikimo:feature/plan_slow jikimo:release/release_2.5 jikimo:feature/weid_sync_update jikimo:feature/message_update jikimo:feature/machining_accuracy_sync jikimo:feature/auxiliary_files_upload jikimo:feature/workorder_exceptions jikimo:feature/临时分支 jikimo:release/release_2.4 jikimo:feature/增加适配开发环境 jikimo:feature/程序用刀异常提醒 jikimo:feature/wechat_message jikimo:feature/update_production_line jikimo:feature/修改网站标题 jikimo:feature/org_info_synchronous jikimo:feature/tax_sync jikimo:feature/优化设备维保标准 jikimo:feature/新增消息提醒 jikimo:feature/仓库发货下发bfm jikimo:hotfix/修复报废-外协入库验证 jikimo:hotfix/修改agv回调接口授权 jikimo:release/release_2.3 jikimo:feature/update_process_start_time jikimo:release/release_2.2 jikimo:release/release_2.1 jikimo:hotfix/修复多面加工产线状态 jikimo:release/release_2.0 jikimo:release/release_1.9 jikimo:release/release_1.8 jikimo:hotfix/修复工件上下产线接口 jikimo:release/release1.7 jikimo:release/release1.6 jikimo:feature/打印配置优化 jikimo:release/release_1.5 jikimo:feature/优化报废和返工 jikimo:release/release_1.4 jikimo:release/release_1.2 jikimo:release/release1.0 jikimo:feature/修改机床参数bug jikimo:feature/优化工件配送及AGV jikimo:feature/产品的权限优化 jikimo:feature/还原产品页面代码 jikimo:feature/sf看板样式统一 jikimo:feature/主题logo添加中文 jikimo:feature/sf-master1.0
jikimo:master_sf_20250701_2.16 jikimo:master_sf_20250610_2.15 jikimo:master_sf_20250509_2.14 jikimo:master_sf_20250428_2.13 jikimo:master_sf_20250415_2.12 jikimo:master_sf_20250401_2.11 jikimo:master_sf_20250304_2.10 jikimo:master_sf_20250121_2.9 jikimo:master_sf_20250107_2.8 jikimo:master_sf_20241208_2.7 jikimo:master_sf_20241104_2.6 jikimo:master_sf_20241011_2.5 jikimo:master_sf_20240830_2.4 jikimo:master_sf_20240724_2.3 jikimo:master_sf_20240724_2.2 jikimo:master_sf_20240724_2.1 jikimo:master_sf_20240703_2.0 jikimo:master_sf_20240701_1.9 jikimo:master_sf_20240624_1.8 jikimo:master_sf_20240619_1.7 jikimo:master_sf_20240617_1.6 jikimo:master_sf_20240613_1.5 jikimo:master_sf_20240605_1.4 jikimo:release_1.3 jikimo:修复工件上下产线 jikimo:master_sf_20240604_1.3 jikimo:master_sf_20240530_1.2 jikimo:release_1_1 jikimo:修复编程单下发接口 jikimo:master_sf_20240529_1.1 jikimo:master_sf_20240518_1.0
...
compare: jikimo:master_sf_20250121_2.9
Branches Tags
jikimo:feature/7230 jikimo:feature/7229 jikimo:feature/物料需求计划管理 jikimo:feature/7277_7280 jikimo:develop jikimo:feature/7248 jikimo:feature/7254_new jikimo:feature/7254 jikimo:feature/增加模块完整性验证 jikimo:feature/7280 jikimo:feature/7253 jikimo:feature/7277 jikimo:feature/7249 jikimo:feature/7231 jikimo:feature/禁止负库存 jikimo:feature/新增plm模块 jikimo:feature/20250604_chenye jikimo:feature/调拨单质检 jikimo:feature/6711 jikimo:release/release_2.15 jikimo:feature/新增坯料类型 jikimo:master jikimo:feature/请购明细 jikimo:feature/根据项目组区分sf代码 jikimo:feature/7119_lxbTest jikimo:feature/齐套检查与下达生产 jikimo:feature/坯料尺寸显示修改 jikimo:feature/7151 jikimo:feature/前端样式修改 jikimo:feature/7154 jikimo:feature/7141 jikimo:feature/7134 jikimo:feature/修改产品名称 jikimo:feature/6973 jikimo:hotfix/修复刀具预警没有预警记录和通知 jikimo:release/release_2.14 jikimo:hotfix/备注为空 jikimo:feature/需求计划 jikimo:feature/搜索优化 jikimo:feature/6694 jikimo:feature/pre-three-elment jikimo:feature/merge-6694 jikimo:feature/backup-develop jikimo:feature/tool_standard_library_process jikimo:release/release_2.13 jikimo:feature/采购申请优化 jikimo:feature/sync-develop-with-master jikimo:release/release_2.12 jikimo:feature/process_outsourcing_code_stripping jikimo:feature/制造功能优化 jikimo:feature/页面显示优化 jikimo:feature/6763 jikimo:feature/6684 jikimo:hotfix/解决采购申请bug jikimo:release/release_2.11 jikimo:feature/6679 jikimo:feature/6686 jikimo:release/release_2.10 jikimo:feature/mrp_bug_fixed jikimo:feature/commercially_launched jikimo:feature/零件图号筛选 jikimo:feature/优化调拨列表 jikimo:release/release_2.9 jikimo:feature/合同审批 jikimo:feature/取消加工订单 jikimo:feature/工单返工优化 jikimo:feature/报废优化 jikimo:feature/customer_supply jikimo:feature/验证合并的逻辑 jikimo:release/release_2.8 jikimo:feature/修改制造订单列表显示 jikimo:feature/增加质检模块 jikimo:feature/加工能力显示重叠 jikimo:feature/零件图号名称优化需求 jikimo:feature/part_number jikimo:release/release_2.7 jikimo:feature/消息提醒优化 jikimo:feature/sale_order_route_pick jikimo:feature/customer_material_optimization jikimo:feature/逾期工单批量重新安排 jikimo:feature/delivery_status jikimo:feature/manufactur_order jikimo:release/release_2.6 jikimo:feature/new111 jikimo:feature/model_type_update jikimo:feature/new1 jikimo:feature/new jikimo:feature/10月迭代优化 jikimo:feature/销售和排程添加消息推送 jikimo:feature/plan_slow jikimo:release/release_2.5 jikimo:feature/weid_sync_update jikimo:feature/message_update jikimo:feature/machining_accuracy_sync jikimo:feature/auxiliary_files_upload jikimo:feature/workorder_exceptions jikimo:feature/临时分支 jikimo:release/release_2.4 jikimo:feature/增加适配开发环境 jikimo:feature/程序用刀异常提醒 jikimo:feature/wechat_message jikimo:feature/update_production_line jikimo:feature/修改网站标题 jikimo:feature/org_info_synchronous jikimo:feature/tax_sync jikimo:feature/优化设备维保标准 jikimo:feature/新增消息提醒 jikimo:feature/仓库发货下发bfm jikimo:hotfix/修复报废-外协入库验证 jikimo:hotfix/修改agv回调接口授权 jikimo:release/release_2.3 jikimo:feature/update_process_start_time jikimo:release/release_2.2 jikimo:release/release_2.1 jikimo:hotfix/修复多面加工产线状态 jikimo:release/release_2.0 jikimo:release/release_1.9 jikimo:release/release_1.8 jikimo:hotfix/修复工件上下产线接口 jikimo:release/release1.7 jikimo:release/release1.6 jikimo:feature/打印配置优化 jikimo:release/release_1.5 jikimo:feature/优化报废和返工 jikimo:release/release_1.4 jikimo:release/release_1.2 jikimo:release/release1.0 jikimo:feature/修改机床参数bug jikimo:feature/优化工件配送及AGV jikimo:feature/产品的权限优化 jikimo:feature/还原产品页面代码 jikimo:feature/sf看板样式统一 jikimo:feature/主题logo添加中文 jikimo:feature/sf-master1.0
jikimo:master_sf_20250701_2.16 jikimo:master_sf_20250610_2.15 jikimo:master_sf_20250509_2.14 jikimo:master_sf_20250428_2.13 jikimo:master_sf_20250415_2.12 jikimo:master_sf_20250401_2.11 jikimo:master_sf_20250304_2.10 jikimo:master_sf_20250121_2.9 jikimo:master_sf_20250107_2.8 jikimo:master_sf_20241208_2.7 jikimo:master_sf_20241104_2.6 jikimo:master_sf_20241011_2.5 jikimo:master_sf_20240830_2.4 jikimo:master_sf_20240724_2.3 jikimo:master_sf_20240724_2.2 jikimo:master_sf_20240724_2.1 jikimo:master_sf_20240703_2.0 jikimo:master_sf_20240701_1.9 jikimo:master_sf_20240624_1.8 jikimo:master_sf_20240619_1.7 jikimo:master_sf_20240617_1.6 jikimo:master_sf_20240613_1.5 jikimo:master_sf_20240605_1.4 jikimo:release_1.3 jikimo:修复工件上下产线 jikimo:master_sf_20240604_1.3 jikimo:master_sf_20240530_1.2 jikimo:release_1_1 jikimo:修复编程单下发接口 jikimo:master_sf_20240529_1.1 jikimo:master_sf_20240518_1.0

6 Commits
feature/66 ... master_sf_

Author SHA1 Message Date
胡尧
d3a1e9b341 Merge branch 'release/release_2.8' 2025-01-21 10:43:09 +08:00
胡尧
8db80e1ed6 Merge branch 'release/release_2.7' 2025-01-07 20:16:29 +08:00
胡尧
fc378df597 Merge branch 'release/release_2.6' 2024-12-08 19:56:05 +08:00
胡尧
0575d89227 Merge branch 'release/release_2.5' 2024-11-04 19:49:05 +08:00
胡尧
39afc99b8f Merge branch 'release/release_2.4' 2024-10-11 09:29:34 +08:00
杨金灵
f230ad55fb Accept Merge Request #1284: (hotfix/修复报废-外协入库验证 -> master) 
Merge Request: 修复报废-外协入库验证

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1284
 2024-09-06 13:47:55 +08:00
Expand all files Collapse all files

Diff Content Not Available