Commit Graph - test - Gitea: Git with a cup of tea

jikimo/test

Fork 0

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

修复工件上下产线

修复编程单下发接口

e711ff0ab3 优化了产线设备资源设置，新增根据选取的工作中心自动带出设备的数据，新增根据选择的工作日历自动带出班次的数据，新增搜索视图 yuxianghui 2023-07-07 17:36:42 +08:00
3fdf9130e8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 jinling.yang 2023-07-07 14:39:05 +08:00
e7075a83ca Accept Merge Request #229: (feature/计划管理-基础设置 -> develop) Merge Request: 新增生产线模型，优化了计划管理-基础设置模块禹翔辉 2023-07-07 14:38:15 +08:00
e78a60b6ef Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 yuxianghui 2023-07-07 14:37:08 +08:00
5b5d41559c 优化了工作日历时间输入，新增工作日历设置自动计算时长功能，修改了生产线模型的位置（移至sf_maintenance模块下），优化了部分的产线设备资源设置模型 yuxianghui 2023-07-07 14:36:27 +08:00
123adcfc76 在sf_base下新增生产线模型，优化了计划管理-工作日历设置的手动输入时间和手动输入班次的格式 yuxianghui 2023-07-06 17:38:08 +08:00
1a0fa3fdb0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 jinling.yang 2023-07-06 17:33:47 +08:00
621b75d437 Accept Merge Request #228: (feature/优化库存模块功能 -> develop) Merge Request: 优化货位状态，以及产品显隐逻辑马广威 2023-07-06 15:05:38 +08:00
b72c3ce08a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化库存模块功能 mgw 2023-07-06 15:04:11 +08:00
20c6a67f34 优化货位状态，以及产品显隐逻辑 mgw 2023-07-06 15:03:35 +08:00
c440afa435 Merge branch 'develop' into feature/修改看板样式解决冲突 $WEB许何哲\xuhez$ WEB许何哲\xuhez 2023-07-06 14:41:17 +08:00
8dfcd943f0 Accept Merge Request #227: (feature/前端分支 -> develop) Merge Request: 修改导航栏许何哲 2023-07-06 14:29:10 +08:00
26319beaa4 样式修改 $WEB许何哲\xuhez$ WEB许何哲\xuhez 2023-07-06 14:22:34 +08:00
c0b7e3679b Accept Merge Request #226: (feature/为看板设置颜色 -> develop) Merge Request: 在看板xml中增加判断逻辑选择不同的class属性值，以匹配对应的css颜色马广威 2023-07-06 12:28:00 +08:00
bc7f516d2d 在看板xml中增加判断逻辑选择不同的class属性值，以匹配对应的css颜色 mgw 2023-07-06 12:26:35 +08:00
f31becc215 Accept Merge Request #225: (feature/改造原生库存模块 -> develop) Merge Request: 原生库存模块初步升级已完成马广威 2023-07-06 09:44:08 +08:00
3943b0994e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/改造原生库存模块 mgw 2023-07-06 09:41:42 +08:00
3a653a9485 优化货位看板显示字段 mgw 2023-07-06 09:38:57 +08:00
b754534b5b 完善库存模块新增功能及编码规则，已实现据货架分别展示下属货位的看板，待优化 mgw 2023-07-05 23:02:22 +08:00
66cd682f7d 优化工件装夹 jinling.yang 2023-07-05 17:34:43 +08:00
52674a6747 Accept Merge Request #224: (feature/计划管理-基础设置 -> develop) Merge Request: 新增计划管理模块，新增计划管理-工作日志设置模型（未完成），新增计划管理-工序设备资源设置模型（未完成）禹翔辉 2023-07-05 14:51:21 +08:00
a962af0f57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 yuxianghui 2023-07-05 14:48:03 +08:00
caf367b10d 新增工序设备资源设置模型 yuxianghui 2023-07-05 14:47:29 +08:00
afa630682c Accept Merge Request #222: (feature/设备模块优化，自动生成维保计划 -> develop) Merge Request: 设备模块优化龚启豪 2023-07-05 14:34:13 +08:00
3e6130da15 维保计划新增确认维保计划和标记已完成按钮，处理自动生成维保计划的方法报错的bug qihao.gong@jikimo.com 2023-07-05 14:32:22 +08:00
0d7c269c3b 继承原生库存模块，为位置模型增加库区库位等字段 mgw 2023-07-04 20:05:59 +08:00
f685c9a3d4 新增计划管理模块，新增工作日历设置模块（已完成，手动输入时间部分需优化） yuxianghui 2023-07-04 17:37:20 +08:00
e693bd97f3 新增工件组装，工件出库，组装工件功能 jinling.yang 2023-07-04 17:32:14 +08:00
e6060b9bab 修改维保标准维保项目参数为One2many对象并与设备，维保计划关联，修改原生维保计划方法根据保养和检修生成不同的维保计划单 qihao.gong@jikimo.com 2023-07-04 17:30:50 +08:00
3743c65da9 优化夹具产品模板 jinling.yang 2023-06-30 17:35:20 +08:00
4199a86264 Accept Merge Request #221: (feature/刀具管理同步优化，增加字段 -> develop) Merge Request: 修改依赖关系，解决依赖冲突马广威 2023-06-30 15:17:49 +08:00
e0315bafc7 修改依赖关系，解决依赖冲突 mgw 2023-06-30 15:17:10 +08:00
1a937a7476 Accept Merge Request #220: (feature/刀具管理同步优化，增加字段 -> develop) Merge Request: 解决代码冲突马广威 2023-06-29 20:00:14 +08:00
576d2d7758 解决代码冲突 mgw 2023-06-29 19:59:39 +08:00
1f61cf7b5a Accept Merge Request #219: (feature/释放模型转换格式代码 -> develop) Merge Request: 刀具产品模板根据型号展示不同字段和值杨金灵 2023-06-29 18:55:52 +08:00
05227b9022 刀具产品模板根据型号展示不同字段和值 jinling.yang 2023-06-29 18:53:11 +08:00
4212340519 Accept Merge Request #218: (feature/刀具管理同步优化，增加字段 -> develop) Merge Request: 解决代码冲突问题马广威 2023-06-29 17:43:44 +08:00
dbb3ea8a35 解决代码冲突问题 mgw 2023-06-29 17:43:16 +08:00
36fe0cab18 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-06-29 17:17:05 +08:00
8f841314b5 Merge branch 'feature/新增夹具功能' into develop jinling.yang 2023-06-29 17:16:51 +08:00
5bcd1e579d Accept Merge Request #217: (feature/新增夹具功能 -> develop) Merge Request: 新增夹具功能杨金灵 2023-06-29 17:16:35 +08:00
2c71439a96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 jinling.yang 2023-06-29 17:15:33 +08:00
0f7f67aade Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 jinling.yang 2023-06-29 17:14:48 +08:00
0c515cd563 Accept Merge Request #216: (feature/sf刀具功能分支 -> develop) Merge Request: 优化了功能刀具自动申请装刀功能的数据显示问题禹翔辉 2023-06-29 16:54:10 +08:00
80a88b8afb 优化了功能刀具自动申请装刀功能的数据显示问题 yuxianghui 2023-06-29 16:54:18 +08:00
7795cfef29 Accept Merge Request #215: (feature/sf刀具功能分支 -> develop) Merge Request: 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示，新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成禹翔辉 2023-06-29 15:55:58 +08:00
69cb1adc3e 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示，新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成 yuxianghui 2023-06-29 15:56:08 +08:00
e77eb4d20d Accept Merge Request #214: (feature/刀具管理同步优化，增加字段 -> develop) Merge Request: 刀具物料查询功能本地测试完成，推至线上测试马广威 2023-06-29 14:23:53 +08:00
8664c196f0 刀具物料查询功能本地测试完成，推至线上测试 mgw 2023-06-29 14:23:10 +08:00
b32722ca54 Accept Merge Request #213: (feature/sf刀具功能分支 -> develop) Merge Request: 优化了申请换刀功能的数据禹翔辉 2023-06-29 14:15:57 +08:00
d5938bf407 优化了申请换刀功能的数据， yuxianghui 2023-06-29 14:16:10 +08:00
3907901dc3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-06-29 11:18:13 +08:00
6ad7a1e613 Merge branch 'feature/刀具产品模板优化' into develop jinling.yang 2023-06-29 11:17:49 +08:00
89475f46a3 Accept Merge Request #212: (feature/刀具产品模板优化 -> develop) Merge Request: 刀具产品模板优化杨金灵 2023-06-29 11:17:30 +08:00
37b834b3cf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化 jinling.yang 2023-06-29 11:15:40 +08:00
78c13acbab Accept Merge Request #211: (feature/刀具管理同步优化，增加字段 -> develop) Merge Request: 刀具管理同步优化基本完成马广威 2023-06-29 09:57:55 +08:00
2aae162f73 优化sf字段形式 mgw 2023-06-29 09:56:31 +08:00
79dfa10d4e Accept Merge Request #210: (feature/sf刀具功能分支 -> develop) Merge Request: 新增批量出库功能（功能已完成，按键未增加），新增自动组装方法（todo），新增出库按键弹窗样式修改禹翔辉 2023-06-29 09:37:09 +08:00
ec95e09553 新增批量出库功能（功能已完成，按键未增加），新增自动组装方法（todo），新增出库按键弹窗样式修改 yuxianghui 2023-06-29 09:36:54 +08:00
7689701ab1 刀具同步优化完成，字段已添加 mgw 2023-06-28 20:49:16 +08:00
b02cb16dc9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化 jinling.yang 2023-06-28 18:34:39 +08:00
eab6f0ceee 刀具产品页面刀具物料及型号字段修改 jinling.yang 2023-06-28 18:32:45 +08:00
05e69d21fa Accept Merge Request #209: (feature/设备维保 -> develop) Merge Request: 设备维保模块龚启豪 2023-06-28 10:39:28 +08:00
ec0da8cf76 Merge branch refs/heads/develop into refs/heads/feature/设备维保龚启豪 2023-06-28 10:39:23 +08:00
6dc167fae1 Accept Merge Request #208: (feature/sf刀具基础信息管理 -> develop) Merge Request: 优化search筛选框界面显示异常马广威 2023-06-28 10:17:45 +08:00
cb56a3ed83 Accept Merge Request #207: (feature/sf刀具功能分支 -> develop) Merge Request: 新增功能刀具计划模型（已完成），新增功能刀具组装（未完成），优化了功能刀具管理和功能刀具有关的代码禹翔辉 2023-06-28 10:07:21 +08:00
59ae98a21c 优化search筛选框界面显示异常 mgw 2023-06-28 10:03:24 +08:00
5dba31576a 优化了功能刀具管理的代码 yuxianghui 2023-06-28 10:02:59 +08:00
c94c661506 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf刀具功能分支 yuxianghui 2023-06-28 09:15:55 +08:00
1eea2bb1c3 处理设备与设备维保标准的关联关系方法，新增设备故障报警日志页面 qihao.gong@jikimo.com 2023-06-27 17:32:24 +08:00
d6f749fff5 新增功能刀具组装的组装弹窗按键功能（功能已完成）、取消组装功能按键（功能已完成）、出库弹窗按键（已完成视图） yuxianghui 2023-06-27 17:31:49 +08:00
aea68f5239 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 jinling.yang 2023-06-27 16:40:58 +08:00
d18b1808d9 新增同步夹具相关的定时器 jinling.yang 2023-06-27 16:35:30 +08:00
8b94696dc3 Accept Merge Request #205: (feature/sf刀具基础信息管理 -> develop) Merge Request: sf刀具重构完成，同步方法测试完成马广威 2023-06-27 16:27:32 +08:00
e880b020c6 增加了机台换刀申请和CAM程序用刀计划的搜索视图，增加了机台换刀申请的自动换刀功能，增加了CAM程序用刀计划的自动换刀申请功能（待完善） yuxianghui 2023-06-27 10:20:31 +08:00
1348712c83 新增了功能刀具组装界面，新增了功能刀具计划的按键功能，以及按键的显示功能 yuxianghui 2023-06-26 18:10:37 +08:00
87e3f6d04e 新增夹具和功能夹具，及同步mrs的夹具和功能夹具 jinling.yang 2023-06-26 18:07:44 +08:00
65ec935a9f 0626提交 $WEB许何哲\xuhez$ WEB许何哲\xuhez 2023-06-26 17:35:55 +08:00
cf91ef5604 设备维保计划 qihao.gong@jikimo.com 2023-06-26 17:32:56 +08:00
8b227d9ac9 设备维保 qihao.gong@jikimo.com 2023-06-25 17:37:55 +08:00
c37166397e 完成了机台换刀申请的换刀申请按键弹窗数据同步回机台换刀申请界面以及转移按键界面、CAM工单程序用刀计划的申请装刀界面 yuxianghui 2023-06-25 17:36:33 +08:00
65c8d4a4e9 sf刀具重构完成，同步方法测试完成 mgw 2023-06-25 16:44:10 +08:00
f135f0a5e7 完成了弹窗换刀需求信息的视图和默认数据的同步 yuxianghui 2023-06-21 17:21:58 +08:00
6caae0325a 功能刀具计划（换刀申请和CAM工单程序用刀计划）视图已完成 yuxianghui 2023-06-20 16:51:06 +08:00
15304d6eb5 Accept Merge Request #204: (feature/采购刀具产品优化序列号生成规则 -> develop) Merge Request: 采购刀具产品入库优化序列号生成规则杨金灵 2023-06-16 17:13:09 +08:00
6dc2935741 采购入库若选择的产品是刀具，则优化序列号生成规则 jinling.yang 2023-06-16 17:10:31 +08:00
8c9a211295 Accept Merge Request #203: (feature/sf刀具功能分支 -> develop) Merge Request: 智能工厂类型备注样式调整禹翔辉 2023-06-16 11:13:21 +08:00
7d6bd9119b Accept Merge Request #202: (feature/功能刀具页面 -> develop) Merge Request: 处理bug 龚启豪 2023-06-16 11:02:15 +08:00
062b50d34c 智能工厂类型备注样式调整 yuxianghui 2023-06-16 11:01:24 +08:00
23aba08c87 处理bug qihao.gong@jikimo.com 2023-06-16 10:56:25 +08:00
b835103cef 功能刀具管理根据所选功能刀具类型自动填充功能刀具数据（该功能已注释） yuxianghui 2023-06-16 10:07:35 +08:00
018fecfc59 处理冲突 qihao.gong@jikimo.com 2023-06-16 10:02:33 +08:00
e9ad452c43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具页面 qihao.gong@jikimo.com 2023-06-16 10:01:23 +08:00
376731fbd9 Accept Merge Request #201: (feature/sf刀具功能分支 -> develop) Merge Request: 优化了功能刀具实时分布和出入库记录的视图显示效果禹翔辉 2023-06-15 17:05:26 +08:00
4f7489f471 优化了功能刀具实时分布和出入库记录的视图显示效果 yuxianghui 2023-06-15 17:04:40 +08:00
ff904c2c02 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-06-15 16:19:05 +08:00
c81730d7ba 0615t提交 $WEB许何哲\xuhez$ WEB许何哲\xuhez 2023-06-15 16:18:34 +08:00
f455f1e7b4 Merge branch 'feature/刀具基础信息生成产品模板' into develop jinling.yang 2023-06-15 16:18:27 +08:00
0259270ece Accept Merge Request #200: (feature/刀具基础信息生成产品模板 -> develop) Merge Request: 刀具基础信息生成产品模板杨金灵 2023-06-15 16:18:04 +08:00
8a0d89161b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板 jinling.yang 2023-06-15 16:15:28 +08:00