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

• 804bdb60e8 修复外协采购单 jinling.yang 2024-08-29 14:21:18 +08:00
• 302636635c Accept Merge Request #1266: (feature/优化制造功能 -> develop) 马广威 2024-08-28 20:32:23 +08:00
• c465822774 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-28 20:31:35 +08:00
• f9063bf3d9 翻译持久化 mgw 2024-08-28 20:31:20 +08:00
• ea6fb5e570 Accept Merge Request #1265: (feature/优化制造功能 -> develop) 马广威 2024-08-28 18:08:16 +08:00
• 0e672aef79 修复装夹判断逻辑 mgw 2024-08-28 18:07:34 +08:00
• 11ec04de5b Accept Merge Request #1264: (feature/优化制造功能 -> develop) 马广威 2024-08-28 17:43:15 +08:00
• efe98b5133 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-28 17:42:38 +08:00
• 2d2abfce25 修改提示词 mgw 2024-08-28 17:42:23 +08:00
• 821a7a63be 优化工单 jinling.yang 2024-08-28 17:30:46 +08:00
• de221ba67e Accept Merge Request #1263: (feature/tax_sync -> develop) 廖丹龙 2024-08-28 14:55:40 +08:00
• c5bb9a32d0 多面工艺排程问题 liaodanlong 2024-08-28 14:50:39 +08:00
• 925fc2f2b3 Accept Merge Request #1262: (feature/优化下发编程单 -> develop) 杨金灵 2024-08-28 10:42:53 +08:00
• 41f379ef5f 优化下发编程单 jinling.yang 2024-08-28 10:41:16 +08:00
• acc791978d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-28 10:39:11 +08:00
• f24c1ab4a5 Merge branch 'feature/修复报废-下发编程单' into develop jinling.yang 2024-08-28 10:31:04 +08:00
• 179899e483 Accept Merge Request #1261: (feature/修复报废-下发编程单 -> develop) 杨金灵 2024-08-28 10:30:45 +08:00
• b8d21b7fa5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废-下发编程单 jinling.yang 2024-08-28 10:29:14 +08:00
• 295f7ecae3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-28 10:28:10 +08:00
• d2a76a03d2 修复报废-下发编程单 jinling.yang 2024-08-28 10:28:01 +08:00
• 1e172cb4e3 处理代发货下发 hujiaying 2024-08-27 17:24:04 +08:00
• 4424cb58f4 Accept Merge Request #1260: (feature/优化制造功能 -> develop) 马广威 2024-08-27 17:08:35 +08:00
• cd0ea08b21 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-27 17:00:57 +08:00
• 10065e95d3 Merge branch 'feature/修复报废-时间' into develop jinling.yang 2024-08-27 17:00:45 +08:00
• 2c06c6f6a1 Accept Merge Request #1259: (feature/修复报废-时间 -> develop) 杨金灵 2024-08-27 17:00:09 +08:00
• 1eeaf2f85d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-27 16:58:41 +08:00
• aa96e63fff 修复报废-时间 jinling.yang 2024-08-27 16:58:32 +08:00
• 7ac09653c3 Accept Merge Request #1258: (feature/agv_dispatch -> develop) 胡尧 2024-08-27 16:49:35 +08:00
• 9c3ed0166b 修改日期序列的bug 胡尧 2024-08-27 16:49:04 +08:00
• 3c8ce870df Accept Merge Request #1257: (feature/tax_sync -> develop) 廖丹龙 2024-08-27 16:38:22 +08:00
• d8e65a20d5 Merge branch 'refs/heads/develop' into feature/tax_sync liaodanlong 2024-08-27 16:34:57 +08:00
• 10a622b52d 错误处理 liaodanlong 2024-08-27 16:34:27 +08:00
• c1ffd3f870 Accept Merge Request #1255: (feature/刀具组装扫码优化 -> develop) 禹翔辉 2024-08-27 16:18:05 +08:00
• a98b7456c0 Merge branch 'feature/修复报废-坯料序列号' into develop jinling.yang 2024-08-27 16:16:01 +08:00
• 7e3d40bd38 Accept Merge Request #1256: (feature/修复报废-坯料序列号 -> develop) 杨金灵 2024-08-27 16:15:12 +08:00
• 83d45b6d3f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废-坯料序列号 jinling.yang 2024-08-27 16:13:06 +08:00
• fe237dc742 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-27 16:12:57 +08:00
• 35c13dc51c 修复报废-坯料序列号 jinling.yang 2024-08-27 16:12:48 +08:00
• 08477e4d94 Merge branch 'feature/收藏无法删除缺陷优化' into feature/刀具组装扫码优化 yuxianghui 2024-08-27 14:43:16 +08:00
• 069d1f50b0 解决刀具组装时，扫描刚刚拆解完的刀柄状态没有实时更新为可用的问题。 yuxianghui 2024-08-27 14:39:49 +08:00
• dd60dee22d Accept Merge Request #1254: (feature/tax_sync -> develop) 廖丹龙 2024-08-27 14:10:43 +08:00
• e49362e2e3 Merge branch 'refs/heads/develop' into feature/tax_sync liaodanlong 2024-08-27 14:04:13 +08:00
• d5b5231873 多面加工工单排程优化 liaodanlong 2024-08-27 14:03:41 +08:00
• 2b080c1639 优化完成量接口 mgw 2024-08-27 11:43:56 +08:00
• bd3bfc979e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-27 11:39:48 +08:00
• 5a3233d539 Merge branch 'feature/优化表面工艺排序' into develop jinling.yang 2024-08-27 11:39:04 +08:00
• 3e8f045a40 Accept Merge Request #1253: (feature/优化表面工艺排序 -> develop) 杨金灵 2024-08-27 11:38:47 +08:00
• d1fab6aab0 还原代码 jinling.yang 2024-08-27 11:38:30 +08:00
• a3357e01aa Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺排序 jinling.yang 2024-08-27 11:34:39 +08:00
• c46a148856 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-27 11:33:33 +08:00
• 5794f75f0b Merge branch 'feature/修复报废' into develop jinling.yang 2024-08-27 11:33:04 +08:00
• 01d9d4a636 Accept Merge Request #1252: (feature/修复报废 -> develop) 杨金灵 2024-08-27 11:32:46 +08:00
• 2931d6a92d 去掉不要的代码 jinling.yang 2024-08-27 11:32:16 +08:00
• 5e6ae1ff55 去掉设置token代码 jinling.yang 2024-08-27 11:29:17 +08:00
• d7a0dc578b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废 jinling.yang 2024-08-27 11:27:42 +08:00
• 44a11c839f 修复下发编程单（报废） jinling.yang 2024-08-27 11:25:12 +08:00
• 9808f49b3d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-27 11:24:13 +08:00
• b40a87df88 修复报废 jinling.yang 2024-08-27 11:24:04 +08:00
• 72e9443048 Accept Merge Request #1251: (feature/agv_dispatch -> develop) 胡尧 2024-08-27 10:43:44 +08:00
• c6f6927d57 修复工件配送后没有同步任务下发时间的bug，AGV配置中增加是否下发AGV任务 胡尧 2024-08-27 10:42:24 +08:00
• ade7588a9c 修改返回数据顺序 mgw 2024-08-27 10:23:53 +08:00
• 281f03670e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-27 10:20:13 +08:00
• 7356e0afb7 接口优化 mgw 2024-08-27 10:19:53 +08:00
• fcd86e230a Accept Merge Request #1250: (feature/update_process_start_time -> develop) 胡尧 2024-08-27 10:05:55 +08:00
• bf1271a742 Merge remote-tracking branch 'origin/feature/update_process_start_time' into feature/update_process_start_time feature/update_process_start_time guanhuan 2024-08-27 10:02:31 +08:00
• 324ed283c4 员工对象内”工作电子邮件“字段变为必填项 guanhuan 2024-08-27 10:01:22 +08:00
• ebb8007549 销售订单内”取消“按钮变为”拒绝接单“按钮 hujiaying 2024-08-27 09:46:34 +08:00
• 361f187026 Accept Merge Request #1249: (feature/agv_dispatch -> develop) 胡尧 2024-08-27 09:23:50 +08:00
• b35f444e49 修改人工报价流程 胡尧 2024-08-27 09:23:18 +08:00
• 9b2a2d644d Accept Merge Request #1248: (feature/优化制造功能 -> develop) 马广威 2024-08-27 08:57:22 +08:00
• 93ca2000a1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-27 08:56:13 +08:00
• ca43aa836e Accept Merge Request #1247: (feature/agv_dispatch -> develop) 胡尧 2024-08-27 08:55:15 +08:00
• 26ad5b5b3f 优化运行信息接口、优化次数接口 mgw 2024-08-27 08:55:01 +08:00
• 937ea42af3 修改人工报价流程 胡尧 2024-08-27 08:54:33 +08:00
• 9b957848c2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废 jinling.yang 2024-08-27 08:53:29 +08:00
• 36579d22ac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-27 08:53:15 +08:00
• e662490cb5 修复报废 jinling.yang 2024-08-26 17:31:14 +08:00
• 038ce8e139 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-26 17:21:02 +08:00
• e1a4784092 增加设备oee数据 mgw 2024-08-26 17:20:46 +08:00
• 6d4d393b9b Accept Merge Request #1246: (feature/收藏无法删除缺陷优化 -> develop) 禹翔辉 2024-08-26 17:08:53 +08:00
• c956b06f57 Merge branch 'feature/线边料架接口优化' into feature/收藏无法删除缺陷优化 yuxianghui 2024-08-26 17:00:48 +08:00
• da02d68c12 1、将销售单的【取消】改为【拒绝接单】；2、取消功能刀具拆解单的刀柄是否报废按钮； yuxianghui 2024-08-26 16:58:54 +08:00
• eb9b43dc91 解决 【库存概览内增加收藏的默认筛选项后，删除报错（原生报错）】 缺陷 yuxianghui 2024-08-26 16:11:40 +08:00
• ab66e24c9d Accept Merge Request #1244: (feature/update_process_start_time -> develop) 胡嘉莹 2024-08-26 15:06:43 +08:00
• fbbce6332d 修改表面工艺同步测试，删除同步交期，同步周期菜单及同步接口 hujiaying 2024-08-26 15:02:33 +08:00
• 554b86e641 Accept Merge Request #1245: (feature/优化制造功能 -> develop) 马广威 2024-08-26 13:25:08 +08:00
• 54317a529e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-08-26 13:24:00 +08:00
• 78d00e9157 修复coding问题，增加机床类型返回 mgw 2024-08-26 13:23:44 +08:00
• 89cb61f244 修改同步表面工艺 hujiaying 2024-08-26 12:47:15 +08:00
• deef246a6d 修改表面工艺字段同步 hujiaying 2024-08-26 11:10:52 +08:00
• 9de201705f Merge branch 'develop' into feature/update_process_start_time hujiaying 2024-08-26 10:35:59 +08:00
• 8f8d83d4cb Accept Merge Request #1243: (feature/tax_sync -> develop) 廖丹龙 2024-08-26 10:34:58 +08:00
• c703012ec4 会计凭证处理 liaodanlong 2024-08-26 10:08:40 +08:00
• f1780181fa 修复报废向导 jinling.yang 2024-08-25 17:36:07 +08:00
• f5e36f601c 还原注释代码 jinling.yang 2024-08-25 15:01:11 +08:00
• 6c0b84ec43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废 jinling.yang 2024-08-25 14:58:57 +08:00
• 3e438a10ee 优化表面工艺排序 jinling.yang 2024-08-25 14:58:40 +08:00
• 9218633a5e 优化表面工艺 jinling.yang 2024-08-23 17:32:35 +08:00
• c646e70a66 Merge branch 'develop' into feature/update_process_start_time hujiaying 2024-08-23 16:28:42 +08:00
• 40521e06a8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-23 16:13:35 +08:00