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

• 6062ebdf9c Merge branch 'feature/刀具注册' into feature/夹具型号同步优化 yuxianghui 2024-03-18 10:29:22 +08:00
• 698ea31d31 夹具型号同步优化 yuxianghui 2024-03-18 10:28:08 +08:00
• d52c208ba9 Accept Merge Request #907: (feature/制造代码优化 -> develop) 马广威 2024-03-18 09:16:23 +08:00
• 38e3f5f31c 优化用户反馈 mgw 2024-03-18 09:15:39 +08:00
• 4477b12f8d Accept Merge Request #906: (feature/制造代码优化 -> develop) 马广威 2024-03-18 08:52:17 +08:00
• 76ce105289 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-03-18 08:51:30 +08:00
• 0b9f64fbfc 对“还原库存调整按钮”做权限控制 mgw 2024-03-18 08:51:11 +08:00
• 7dac3ad21a Accept Merge Request #905: (feature/制造代码优化 -> develop) 马广威 2024-03-16 11:41:34 +08:00
• aeca8ef2b2 修复“待排程状态的制造订单有实际时长，不应该有【实际时长】、【安排的日期】【计划结束时间】这几个字段”问题 mgw 2024-03-16 11:22:01 +08:00
• 3b7e120eb2 1、优化夹具型号静态数据同步 yuxianghui 2024-03-15 17:38:43 +08:00
• 56dacd0815 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-15 17:09:15 +08:00
• 415717ee10 Merge branch 'feature/优化坯料和修复质量标准' into develop jinling.yang 2024-03-15 17:03:03 +08:00
• 716e04a0a8 Accept Merge Request #904: (feature/优化坯料和修复质量标准 -> develop) 杨金灵 2024-03-15 17:02:47 +08:00
• 8ebf71dc23 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-15 17:00:14 +08:00
• 1a702512e5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化坯料和修复质量标准 jinling.yang 2024-03-15 17:00:05 +08:00
• d5a1a82c72 1.优化分配工厂时材料型号获取方式为采购和外协时未有供应商返回提示 2.修复质量标准去掉审核按钮显示 jinling.yang 2024-03-15 16:59:51 +08:00
• 5e3aff31e0 Accept Merge Request #903: (feature/制造代码优化 -> develop) 马广威 2024-03-15 16:03:24 +08:00
• d1eba51f61 待排程状态隐藏tab页 mgw 2024-03-15 16:02:54 +08:00
• df42932630 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-15 10:54:07 +08:00
• 3c700e57d1 Merge branch 'feature/优化表面工艺可选参数' into develop jinling.yang 2024-03-15 10:53:29 +08:00
• fa66b45373 Accept Merge Request #902: (feature/优化表面工艺可选参数 -> develop) 杨金灵 2024-03-15 10:53:16 +08:00
• 0facdee321 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺可选参数 jinling.yang 2024-03-15 10:48:58 +08:00
• 4d45b81ebc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-15 10:48:13 +08:00
• 4765e34c09 1.优化表面工艺可选参数 2.修复质量警报质量总监没有制造订单访问权限 jinling.yang 2024-03-15 10:48:01 +08:00
• 7717731a22 Accept Merge Request #901: (feature/前端样式修改 -> develop) 黄焱 2024-03-15 10:12:44 +08:00
• f639e59b91 解决频繁报错弹窗，新增判断 黄焱 2024-03-15 10:10:17 +08:00
• 2352f862ee Accept Merge Request #900: (feature/前端样式修改 -> develop) 黄焱 2024-03-15 09:52:05 +08:00
• c3bd0b1391 Merge branch 'feature/前端样式修改' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 黄焱 2024-03-14 16:50:34 +08:00
• 776877f7a4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 黄焱 2024-03-14 16:50:03 +08:00
• cdf8e7227c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 黄焱 2024-03-14 16:47:20 +08:00
• 827b8337bd Merge branch refs/heads/develop into refs/heads/feature/前端样式修改 黄焱 2024-03-14 16:13:01 +08:00
• 603f9e3f34 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-14 15:49:11 +08:00
• f971216c03 Merge branch 'feature/修复部分bug' into develop jinling.yang 2024-03-14 15:48:42 +08:00
• cfc044b7bc Accept Merge Request #899: (feature/修复部分bug -> develop) 杨金灵 2024-03-14 15:48:14 +08:00
• 9120ebe6f7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复部分bug jinling.yang 2024-03-14 15:46:03 +08:00
• 02f1805505 修复部分bug jinling.yang 2024-03-14 15:45:40 +08:00
• b937372f82 Accept Merge Request #898: (feature/制造代码优化 -> develop) 马广威 2024-03-14 14:31:53 +08:00
• 89f3f4b493 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-03-14 14:31:07 +08:00
• 9a47a4c094 Accept Merge Request #897: (feature/修改机床参数bug -> develop) 马广威 2024-03-14 14:30:40 +08:00
• 20436ff6ac 增加必填按钮 修改字段string qihao.gong@jikimo.com 2024-03-14 14:28:38 +08:00
• 70218f29ac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-03-14 14:24:26 +08:00
• 59677c0304 修改zpl相关等 mgw 2024-03-14 14:22:50 +08:00
• 35e2e4354a Accept Merge Request #896: (feature/优化agv接口 -> develop) 杨金灵 2024-03-14 14:08:38 +08:00
• 5743ba5fac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv接口 jinling.yang 2024-03-14 11:54:34 +08:00
• 86ec97bad1 修复刀具产品模版 jinling.yang 2024-03-14 11:54:10 +08:00
• 5e0b4aa509 优化产品页面 jinling.yang 2024-03-13 17:34:35 +08:00
• 8117715a02 Accept Merge Request #895: (feature/制造代码优化 -> develop) 马广威 2024-03-13 09:44:07 +08:00
• cf5fa70f28 修复能力特征库报错：no placeholder mgw 2024-03-13 09:42:46 +08:00
• 1e81ef9174 Accept Merge Request #894: (feature/刀具注册 -> develop) 禹翔辉 2024-03-13 09:08:05 +08:00
• d6c4eb7479 Merge branch 'feature/功能刀具注册优化' into feature/刀具注册 yuxianghui 2024-03-13 09:02:34 +08:00
• 0957bded16 1、优化刀具物料接口、优化功能刀具安全库存接口、优化功能刀具预警接口；2、优化功能刀具组装流程；3、优化刀具物料序列号同步步骤； yuxianghui 2024-03-12 17:39:21 +08:00
• 0c44bba5f2 优化刀具产品 jinling.yang 2024-03-12 17:32:40 +08:00
• 26942afc27 Accept Merge Request #892: (feature/修改机床参数bug -> develop) 龚启豪 2024-03-12 09:48:23 +08:00
• fbce395321 1、优化刀具物料序列号、刀具物料注册接口；2、优化功能刀具、功能刀具出入库记录接口；3、优化刀具物料搜索模型 yuxianghui 2024-03-11 17:34:03 +08:00
• 0289e2f9ff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv接口 jinling.yang 2024-03-11 17:30:46 +08:00
• b24355dd67 1.优化产品页面 2.优化agv回调接口且新增agv参数配置 3.优化工件配送 jinling.yang 2024-03-11 17:30:32 +08:00
• b315f4b3fe 维保计划项目可删除 qihao.gong@jikimo.com 2024-03-11 17:23:43 +08:00
• a705d805c9 设置设备模块页面强制必填字段及标识需求【表格】 黄焱 2024-03-11 15:39:15 +08:00
• e3b8b0a43d Accept Merge Request #891: (feature/制造代码优化 -> develop) 马广威 2024-03-11 11:26:19 +08:00
• 2044db4d3e 修复权限问题 mgw 2024-03-11 11:25:31 +08:00
• 8a800e909f 修改工单显隐控制逻辑 mgw 2024-03-11 10:56:03 +08:00
• 0f2e6b165c 因接口触发按钮，无法触发按钮切换事件。经沟通，暂时隐藏手动触发开始等按钮的功能。 mgw 2024-03-08 21:46:26 +08:00
• b16d2c2864 删除工序，加工工艺，新增表面工艺可选参数相关视图 qihao.gong@jikimo.com 2024-03-08 17:32:21 +08:00
• 61b0b57b87 优化功能刀具等注册接口 yuxianghui 2024-03-08 17:31:11 +08:00
• cfdc7f93ed Accept Merge Request #890: (feature/前端样式修改 -> develop) 黄焱 2024-03-08 15:15:14 +08:00
• d9cbc52928 Merge branch refs/heads/develop into refs/heads/feature/前端样式修改 黄焱 2024-03-08 15:14:07 +08:00
• 62e5105191 更改表格底部按钮样式 黄焱 2024-03-08 15:11:59 +08:00
• 1b6e474b9e Accept Merge Request #889: (feature/功能刀具注册优化 -> develop) 禹翔辉 2024-03-07 17:28:58 +08:00
• a7e43ad9af Merge branch 'feature/功能刀具注册-新' into feature/功能刀具注册优化 yuxianghui 2024-03-07 17:25:26 +08:00
• 47692a9b43 1、测试功能刀具相关模型的注册接口并优化；2、功能刀具管理模块中的需要注册的模型前端页面添加注册按钮； yuxianghui 2024-03-07 17:20:43 +08:00
• 21ebbc877a Accept Merge Request #888: (feature/制造代码优化 -> develop) 马广威 2024-03-07 11:54:52 +08:00
• 457035e464 修改按钮样式、优化权限 mgw 2024-03-07 11:53:57 +08:00
• 71cb09c08b 1、刀具物料搜索模型添加编码字段，添加自动计算编码方法；2、完善刀具物料搜索和功能刀具列表注册到cloud的接口； yuxianghui 2024-03-06 17:30:54 +08:00
• 70d6fb5660 Accept Merge Request #887: (feature/制造代码优化 -> develop) 马广威 2024-03-06 11:21:38 +08:00
• b4e0436b41 修复权限问题 mgw 2024-03-06 11:20:58 +08:00
• 0262d709eb Accept Merge Request #886: (feature/修改机床参数bug -> develop) 龚启豪 2024-03-05 17:03:10 +08:00
• 1a50a8220e 处理设备字段类型相关缺陷 qihao.gong@jikimo.com 2024-03-05 16:50:08 +08:00
• f2213bd5f4 Accept Merge Request #885: (feature/制造代码优化 -> develop) 马广威 2024-03-05 11:37:56 +08:00
• fcbe33714e 修改工单状态 mgw 2024-03-05 11:37:21 +08:00
• 184ca7940b Accept Merge Request #884: (feature/功能优化 -> develop) 禹翔辉 2024-03-04 17:17:11 +08:00
• dceaf7fe8d Merge branch 'feature/刀具添加归档功能' into feature/功能优化 yuxianghui 2024-03-04 17:13:42 +08:00
• d85b05f999 1 yuxianghui 2024-03-04 17:11:18 +08:00
• 9d2bad977c 1、产品模型的产品类别字段添加必填标记；2、制造订单的工单添加RFID码(已解除)字段，当工单解除装夹时保存RFID码到RFID码(已解除)字段进行展示；3、功能刀具列表的当前位置字段改为Selection类型，并优化自动计算功能刀具当前位置的方法；4、获取机床刀库信息时，对新装刀的功能刀具进行库存位移刀制造前(机内刀库)；5、优化功能刀具组装时扫码自动录入RFID码功能； yuxianghui 2024-03-04 17:10:41 +08:00
• 4c8ba67cad Accept Merge Request #883: (feature/制造代码优化 -> develop) 马广威 2024-03-04 11:54:20 +08:00
• 3ca5c02880 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-03-04 11:52:29 +08:00
• 3c0649392e 优化代码 mgw 2024-03-04 11:52:04 +08:00
• 8a2d6df43b Accept Merge Request #882: (feature/前端样式修改 -> develop) 黄焱 2024-03-04 11:25:29 +08:00
• 98103bac73 修改必填标识js，修改之前必填标识样式 黄焱 2024-03-04 11:21:50 +08:00
• 6cbc21cc4e 调整必填、增加用户组控制 mgw 2024-03-04 10:58:39 +08:00
• 7edeb59853 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 黄焱 2024-03-04 10:27:56 +08:00
• 806f921ad2 Accept Merge Request #881: (feature/制造代码优化 -> develop) 马广威 2024-03-04 09:47:32 +08:00
• ec54c8e014 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-03-04 09:45:55 +08:00
• b7be5251b8 处理采购订单按钮展示的问题 mgw 2024-03-04 09:45:19 +08:00
• 33dc25f400 优化质量相关翻译，增加必填标识 mgw 2024-03-04 09:18:12 +08:00
• e761ff9140 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 黄焱 2024-03-01 16:31:12 +08:00
• 2f26a42b68 Accept Merge Request #880: (feature/制造代码优化 -> develop) 马广威 2024-03-01 16:27:12 +08:00
• 2ed7aa60ff Accept Merge Request #879: (feature/修改机床参数bug -> develop) 马广威 2024-03-01 15:46:04 +08:00
• 7e4a3251c8 增加必填标识 qihao.gong@jikimo.com 2024-03-01 15:43:03 +08:00
• b73e46dbc4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-03-01 11:34:59 +08:00
• 4185b79e0d 修改csv权限相关文件 qihao.gong@jikimo.com 2024-03-01 11:30:03 +08:00