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

Mono Color

• e124560089 修复无外协单和程序单 jinling.yang 2024-06-30 17:52:02 +08:00
• fd3a363bf6 修复无外协单和程序单 jinling.yang 2024-06-30 16:51:40 +08:00
• 9f6563186c Accept Merge Request #1116: (feature/优化工单页面 -> develop) 杨金灵 2024-06-30 14:47:44 +08:00
• 1b174c5805 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-30 14:41:38 +08:00
• 849b7be20d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-30 14:09:34 +08:00
• 9d32bf8363 Merge branch 'feature/修复制造订单状态和多个编程单问题' into develop jinling.yang 2024-06-30 12:46:48 +08:00
• 998daaa7f7 Accept Merge Request #1115: (feature/修复制造订单状态和多个编程单问题 -> develop) 杨金灵 2024-06-30 12:45:54 +08:00
• b23cb9af6e 优化编程状态字段的样式 jinling.yang 2024-06-30 12:09:09 +08:00
• 56adaddefc 1.修复编程状态字段类型2.优化工单rfid排放位置 jinling.yang 2024-06-30 12:01:48 +08:00
• 4a648fbd7b 1,修复制造订单状态：第一张装夹工单未就绪是，状态需为：待加工;所有工单完成后,状态需为：完成;2.修复多个产品确认制造订单未生产多个编程单问题3.优化工单页面：去掉非必要的字段 jinling.yang 2024-06-30 11:45:52 +08:00
• a3bf451d83 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化 mgw 2024-06-28 17:03:06 +08:00
• 2919a3c159 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化 mgw 2024-06-28 17:02:47 +08:00
• 8f6e2bc13d Accept Merge Request #1114: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-06-28 17:01:43 +08:00
• 909230c1cc 排程单甘特图界面订单的hover提示中订单交期字段没有翻译成日期格式 mgw 2024-06-28 17:00:50 +08:00
• db8c338588 Accept Merge Request #1113: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-06-28 16:02:09 +08:00
• f319a9adf4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化 mgw 2024-06-28 16:01:05 +08:00
• 172e420939 增加分组内排序 mgw 2024-06-28 16:00:50 +08:00
• 0c3727540e 工单增加默认产品分组 mgw 2024-06-28 14:51:53 +08:00
• 5668722109 Accept Merge Request #1112: (feature/工单优化-1 -> develop) 禹翔辉 2024-06-28 14:25:01 +08:00
• 2d80355559 Accept Merge Request #1111: (feature/修复cmm程序接口 -> develop) 杨金灵 2024-06-28 14:24:23 +08:00
• d281026086 修复cmm程序接口 jinling.yang 2024-06-28 14:23:03 +08:00
• 5c35a8c38d Merge branch 'feature/添加权限、解决bug' into feature/工单优化-1 yuxianghui 2024-06-28 14:22:35 +08:00
• 3b24f90385 1、工单添加按Rfid搜索，隐藏多余的Rfid字段；2、优化程序创建日期； yuxianghui 2024-06-28 14:20:57 +08:00
• 14355606c7 Accept Merge Request #1110: (feature/优化ftp -> develop) 杨金灵 2024-06-28 12:03:05 +08:00
• 5997cbcb0e download_program_file方法添加关闭ftp jinling.yang 2024-06-28 12:00:29 +08:00
• f07d7611d0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-28 10:10:46 +08:00
• b106d56f3f Accept Merge Request #1109: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-06-28 09:52:58 +08:00
• 3156052604 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化 mgw 2024-06-28 09:51:50 +08:00
• c8de75ceae 修复隐藏项目 mgw 2024-06-28 09:51:31 +08:00
• d4b1f8f1a1 Accept Merge Request #1108: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-06-28 09:45:59 +08:00
• 5378d62551 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化 mgw 2024-06-28 09:44:24 +08:00
• 424f7196f8 Accept Merge Request #1107: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-06-28 09:19:58 +08:00
• c2723d9d05 处理unlink传参问题2 mgw 2024-06-28 09:19:09 +08:00
• 7bf001927a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-28 09:17:56 +08:00
• 84d67d285e Accept Merge Request #1106: (feature/修复制造订单无采购单问题 -> develop) 杨金灵 2024-06-28 09:16:32 +08:00
• a583b483e3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单无采购单问题 jinling.yang 2024-06-27 20:10:22 +08:00
• 719a96f983 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-27 20:10:01 +08:00
• 08fd0b01d3 去掉程序下发按钮 jinling.yang 2024-06-27 20:09:45 +08:00
• db7fbed177 去掉重新编程下发相关代码，修复多制造订单无采购调拨单，去掉程序下发按钮 jinling.yang 2024-06-27 20:09:28 +08:00
• ad149a58ea Accept Merge Request #1105: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-06-27 17:32:18 +08:00
• 0d96cd070c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化 mgw 2024-06-27 17:31:21 +08:00
• 37f030c2db 处理unlink()参数问题 mgw 2024-06-27 17:31:03 +08:00
• e2a62325f8 Accept Merge Request #1104: (feature/添加权限、解决bug -> develop) 禹翔辉 2024-06-27 17:26:20 +08:00
• 0db103cfc7 Merge branch 'feature/调拨单优化1' into feature/添加权限、解决bug yuxianghui 2024-06-27 17:22:42 +08:00
• 05f2cb553d 1、完成 采购/采购总监岗位权限增加 需求；2、完成 刀具出入库列表缺少单据跳转 需求；3、完成 设备详情的机内装刀时间比当前时间还晚 bug； yuxianghui 2024-06-27 17:21:37 +08:00
• c597471949 Accept Merge Request #1103: (feature/前端样式修改 -> develop) 黄焱 2024-06-27 10:14:10 +08:00
• 70ffbafac4 甘特修改背景颜色和不可拖拽模块 hy 2024-06-27 09:57:12 +08:00
• 1cb7af072e 注释OCC代码 jinling.yang 2024-06-27 09:52:20 +08:00
• 4f6b1d0342 Accept Merge Request #1102: (feature/调拨单优化1 -> develop) 禹翔辉 2024-06-26 17:10:25 +08:00
• 9bdcf0dd92 Merge branch 'feature/调拨单优化' into feature/调拨单优化1 yuxianghui 2024-06-26 17:08:39 +08:00
• bcb60425b2 1、完成 内部调拨单优化项 需求；2、解决 不同序列号调拨单选择同一个货位可以确认成功 bug；3、收货入库时扫描录入Rfid方法添加日志 yuxianghui 2024-06-26 17:07:09 +08:00
• 22643368fa Merge branch 'feature/修复工单完成报错库存问题' into develop jinling.yang 2024-06-26 16:41:23 +08:00
• aeb100923f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工单完成报错库存问题 jinling.yang 2024-06-26 16:41:05 +08:00
• 53c6d6015e Accept Merge Request #1101: (feature/修复工单完成报错库存问题 -> develop) 杨金灵 2024-06-26 16:40:40 +08:00
• 131e9329de Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-26 16:37:05 +08:00
• dbd5c488f8 修复制造订单生成时没有采购单 jinling.yang 2024-06-26 16:36:51 +08:00
• f8ba414229 Accept Merge Request #1100: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-06-26 16:34:52 +08:00
• 7fd3647afb sf物流优化 mgw 2024-06-26 16:34:04 +08:00
• f5be9c6e65 Accept Merge Request #1099: (feature/制造订单列表页及详情页优化需求 -> develop) 马广威 2024-06-26 14:13:06 +08:00
• c275a39a15 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造订单列表页及详情页优化需求 mgw 2024-06-26 14:11:45 +08:00
• d07ab53aeb 制造订单列表页及详情页优化需求 mgw 2024-06-26 14:10:57 +08:00
• 55accb714a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-26 11:25:47 +08:00
• 5bd3eddfd5 Merge branch 'feature/修复编程单下发ftp路径' into develop jinling.yang 2024-06-26 11:24:58 +08:00
• c8bcd4d0f5 Accept Merge Request #1098: (feature/修复编程单下发ftp路径 -> develop) 杨金灵 2024-06-26 11:24:40 +08:00
• 2cbe5ed394 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复编程单下发ftp路径 jinling.yang 2024-06-26 11:11:26 +08:00
• 1f1cb17a40 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-26 11:11:08 +08:00
• 2ff935f68d 修复编程单下发ftp路径 jinling.yang 2024-06-26 11:10:54 +08:00
• 098745ec50 Accept Merge Request #1097: (feature/修复编程单下发ftp路径 -> develop) 杨金灵 2024-06-26 10:21:25 +08:00
• 94175f2039 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-26 10:17:27 +08:00
• 1940116a35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复编程单下发ftp路径 jinling.yang 2024-06-26 10:17:14 +08:00
• f4eb378bea 修复制造订单：无工单时，工单page需隐藏 jinling.yang 2024-06-26 10:17:00 +08:00
• dcbb60b088 修复编程单下发ftp路径:去掉注释 jinling.yang 2024-06-25 18:11:45 +08:00
• 88ef9c106d 修复编程单下发ftp路径 jinling.yang 2024-06-25 17:54:08 +08:00
• 0f7f12008f Accept Merge Request #1096: (feature/【计划】模块的【排程单】页面优化需求 -> develop) 马广威 2024-06-25 16:51:47 +08:00
• f44836705b 放出程序下载按钮 mgw 2024-06-25 16:50:09 +08:00
• 35ac51bc10 取消默认分组展示 mgw 2024-06-25 14:22:51 +08:00
• eb2851391b 处理"打印的二维码信息与界面的二维码信息不一致" mgw 2024-06-25 12:06:28 +08:00
• 86f67556ce Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-25 11:07:41 +08:00
• e437875a92 Accept Merge Request #1095: (release/release_1.8 -> develop) 禹翔辉 2024-06-25 09:53:14 +08:00
• f005a29beb Merge branch refs/heads/develop into refs/heads/release/release_1.8 release/release_1.8 禹翔辉 2024-06-25 09:47:34 +08:00
• 6a24776701 Accept Merge Request #1094: (feature/【计划】模块的【排程单】页面优化需求 -> develop) 马广威 2024-06-25 09:04:10 +08:00
• 09d06980b5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/【计划】模块的【排程单】页面优化需求 mgw 2024-06-25 09:03:13 +08:00
• 8b492fc093 计划模块后端优化 mgw 2024-06-25 09:02:54 +08:00
• 9e56aeda67 Accept Merge Request #1093: (release/release_1.8 -> master) 马广威 2024-06-24 21:38:15 +08:00
• b4535e88c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-24 17:31:08 +08:00
• ba03790832 Accept Merge Request #1092: (hotfix/优化工单工序 -> develop) 禹翔辉 2024-06-24 17:30:28 +08:00
• be94cd0d54 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-24 17:30:03 +08:00
• 3148cd55b8 Accept Merge Request #1091: (feature/单据跳转2 -> develop) 禹翔辉 2024-06-24 17:29:17 +08:00
• 665ebaab9e 1、重新下发NC程序按键添加权限 yuxianghui 2024-06-24 17:28:06 +08:00
• 65e209fe2a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-24 17:20:18 +08:00
• 40969adc2c Accept Merge Request #1090: (feature/单据跳转2 -> develop) 禹翔辉 2024-06-24 17:15:55 +08:00
• 95e89d8979 1 yuxianghui 2024-06-24 17:10:39 +08:00
• 5b400b746e Merge branch 'feature/单据跳转' into feature/单据跳转2 yuxianghui 2024-06-24 17:09:40 +08:00
• 828b4b0f6b 修复功能刀具清单列表 hotfix/修复工件上下产线接口 jinling.yang 2024-06-24 16:55:42 +08:00
• 27ba002b51 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-24 16:54:28 +08:00
• 2cd83c87e2 Merge branch 'feature/优化重新下发程序' into develop jinling.yang 2024-06-24 16:52:48 +08:00
• ba87d07af7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-24 16:52:24 +08:00
• 7d2c705c35 Accept Merge Request #1089: (feature/优化重新下发程序 -> develop) 杨金灵 2024-06-24 16:51:56 +08:00
• f3c2db7add Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化重新下发程序 jinling.yang 2024-06-24 16:49:19 +08:00
• 0af6d7f4cd 优化重新下发程序:装夹预调，cnc加工工单展示 jinling.yang 2024-06-24 16:48:58 +08:00