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

• d5e93b14be Accept Merge Request #1885: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-27 16:14:24 +08:00
• d4f42abfd8 隐藏发料出库的批量调拨按钮 liaodanlong 2025-02-27 16:12:12 +08:00
• 07c07ef37c 完善下游单据问题 mgw 2025-02-27 16:00:29 +08:00
• 8fd536324e Accept Merge Request #1884: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-27 15:11:21 +08:00
• 22c5ee6806 隐藏收料入库的批量调拨按钮 liaodanlong 2025-02-27 15:09:57 +08:00
• 3bcc673d88 人工线下加工表面工艺逻辑还原 liaodanlong 2025-02-27 15:09:14 +08:00
• 90a7a025b1 Accept Merge Request #1883: (feature/制造功能优化 -> develop) 马广威 2025-02-27 14:54:13 +08:00
• 95929fa01c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-27 14:53:41 +08:00
• 19eb6519c0 组件制造调拨外置 mgw 2025-02-27 14:53:23 +08:00
• 188e1fc553 Accept Merge Request #1882: (feature/制造功能优化 -> develop) 马广威 2025-02-27 14:37:47 +08:00
• 197f1f65ea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-27 14:37:21 +08:00
• bae6d4d59b 调整名称等 mgw 2025-02-27 14:37:03 +08:00
• 211e9c58f1 Accept Merge Request #1881: (feature/制造功能优化 -> develop) 马广威 2025-02-27 14:01:33 +08:00
• 46d1c9a83d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-27 14:00:58 +08:00
• 92adde7909 处理空值情况 mgw 2025-02-27 14:00:41 +08:00
• a8f70c82d1 Accept Merge Request #1879: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-27 13:55:33 +08:00
• 1efb6be453 Accept Merge Request #1880: (feature/制造功能优化 -> develop) 马广威 2025-02-27 13:55:19 +08:00
• b6165e333b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-27 13:54:46 +08:00
• ed17444f21 统一处理质检单 mgw 2025-02-27 13:54:28 +08:00
• 20932f9d51 人工线下加工表面工艺逻辑修改 liaodanlong 2025-02-27 13:46:30 +08:00
• 43904c0249 Accept Merge Request #1878: (feature/外协优化 -> develop) 禹翔辉 2025-02-27 13:14:24 +08:00
• 919717ccc5 处理工单外协创建的外协出入库单没有质检单的问题 yuxianghui 2025-02-27 13:13:22 +08:00
• a4898297b7 Accept Merge Request #1877: (feature/制造功能优化 -> develop) 马广威 2025-02-27 11:33:19 +08:00
• 75bbbaa027 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-27 11:32:46 +08:00
• b693252a7b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-27 11:32:29 +08:00
• 4db8a29bc1 Accept Merge Request #1876: (feature/制造功能优化 -> develop) 马广威 2025-02-27 11:27:05 +08:00
• 88fceb016f 调整单据状态 mgw 2025-02-27 11:26:26 +08:00
• 712e1f3947 Accept Merge Request #1875: (feature/制造功能优化 -> develop) 马广威 2025-02-27 11:00:19 +08:00
• d1a71e1a05 完善单据 mgw 2025-02-27 10:58:06 +08:00
• 0c3e730619 Accept Merge Request #1874: (feature/制造功能优化 -> develop) 马广威 2025-02-27 09:58:58 +08:00
• 0063a199f8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-27 09:58:29 +08:00
• 7af9b25eee 取消列表单据只读 mgw 2025-02-27 09:58:12 +08:00
• 7f195f9e5f Accept Merge Request #1873: (feature/合同审批 -> develop) 管欢 2025-02-27 09:54:51 +08:00
• 000cd9a13c 修复坯料发料提醒重复发送 feature/合同审批 guanhuan 2025-02-27 09:53:42 +08:00
• 3771a62dae Accept Merge Request #1871: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-27 09:18:55 +08:00
• 172219a3e2 Accept Merge Request #1872: (feature/制造功能优化 -> develop) 马广威 2025-02-27 09:18:15 +08:00
• 7bd17ea8da Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-27 09:17:06 +08:00
• f234943104 调整行号 mgw 2025-02-27 09:16:50 +08:00
• 9b9b0a30a3 批量调拨按钮隐藏 liaodanlong 2025-02-27 09:10:07 +08:00
• 3552c11122 Accept Merge Request #1870: (feature/制造功能优化 -> develop) 马广威 2025-02-27 09:05:59 +08:00
• e0e5dc8f7e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-27 09:04:58 +08:00
• d608b78f8c 坯料外协单据 mgw 2025-02-27 09:04:38 +08:00
• 513daa7c2b 补全单据 mgw 2025-02-26 17:39:34 +08:00
• 57342ec843 Accept Merge Request #1869: (feature/前端样式修改 -> develop) 黄焱 2025-02-26 16:40:33 +08:00
• 352dc89e91 还原序号处理 hyyy 2025-02-26 16:29:19 +08:00
• 8dc6c1a617 Accept Merge Request #1868: (feature/制造功能优化 -> develop) 马广威 2025-02-26 14:48:43 +08:00
• 82cbd95b7d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-26 14:47:45 +08:00
• a4bfda0a41 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-26 14:47:28 +08:00
• 6e0e00a5a1 Accept Merge Request #1867: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-26 14:38:34 +08:00
• 0cb73b6d29 切割工单过滤掉回退按钮 liaodanlong 2025-02-26 14:36:50 +08:00
• 358ad68dc9 Accept Merge Request #1866: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-26 14:17:33 +08:00
• cd115ea411 过滤掉检测结果为合格的数据 liaodanlong 2025-02-26 14:15:46 +08:00
• 64fa908519 Accept Merge Request #1865: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-26 13:33:40 +08:00
• 266c448c00 字段名称修改 liaodanlong 2025-02-26 13:21:27 +08:00
• 1fb39e55c7 Accept Merge Request #1864: (feature/制造功能优化 -> develop) 马广威 2025-02-26 13:09:45 +08:00
• dbaf5342fc 去除对切割工单的编程控制 mgw 2025-02-26 13:09:15 +08:00
• 8bfb5b3b79 Accept Merge Request #1863: (feature/制造功能优化 -> develop) 马广威 2025-02-26 12:43:21 +08:00
• 897a10a500 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-26 12:42:58 +08:00
• 2035dd6857 切割工单隐藏编程相关 mgw 2025-02-26 12:42:42 +08:00
• 4beaeffd46 Accept Merge Request #1862: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-26 11:32:02 +08:00
• cd78a39410 匹配规则修改 liaodanlong 2025-02-26 11:30:14 +08:00
• 2e47922086 匹配规则修改 liaodanlong 2025-02-26 11:25:09 +08:00
• fd76863daa Accept Merge Request #1861: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-26 10:48:29 +08:00
• 85c8e834cb 匹配规则修改 liaodanlong 2025-02-26 10:46:02 +08:00
• e4c729e8e0 Accept Merge Request #1860: (feature/制造功能优化 -> develop) 马广威 2025-02-26 10:41:42 +08:00
• e9226a87f5 调整判断逻辑 mgw 2025-02-26 10:41:05 +08:00
• 22b0b02168 Accept Merge Request #1859: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-26 10:31:10 +08:00
• bff10de6b2 修改计算方法名称 liaodanlong 2025-02-26 10:29:01 +08:00
• ebe8d56ffd Accept Merge Request #1854: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-26 10:22:03 +08:00
• d7e3ce2b1a 刀具标准库数据同步 liaodanlong 2025-02-26 10:21:40 +08:00
• ae7e902b4d Accept Merge Request #1858: (feature/制造功能优化 -> develop) 马广威 2025-02-26 10:13:57 +08:00
• 0be9afcdfe 修改变量名 mgw 2025-02-26 10:13:26 +08:00
• 02582470e5 Accept Merge Request #1857: (feature/制造功能优化 -> develop) 马广威 2025-02-26 10:06:55 +08:00
• e3b2dade15 调整判断逻辑 mgw 2025-02-26 10:06:27 +08:00
• f6e36014c8 Accept Merge Request #1856: (feature/制造功能优化 -> develop) 马广威 2025-02-26 09:58:39 +08:00
• f89b52bad1 修改状态名称 mgw 2025-02-26 09:58:16 +08:00
• 157ce5e2dc Accept Merge Request #1855: (feature/制造功能优化 -> develop) 马广威 2025-02-26 09:54:53 +08:00
• 478c54a44d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-26 09:54:24 +08:00
• f06951958d sf-工厂取消接单-取消列表展示数据问题 mgw 2025-02-26 09:54:08 +08:00
• 8799fcddb2 还原代码 liaodanlong 2025-02-26 09:41:17 +08:00
• 0d25eb5009 Accept Merge Request #1853: (feature/制造功能优化 -> develop) 马广威 2025-02-26 09:41:07 +08:00
• 92c3de98ba Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-26 09:40:39 +08:00
• dca6f9fb53 sf-工厂取消接单-坯料的制造订单未取消 mgw 2025-02-26 09:40:18 +08:00
• c4c6386871 坯料的采购订单零件图号，零件名称显示 liaodanlong 2025-02-26 09:37:56 +08:00
• 4bdeec6e24 Accept Merge Request #1852: (feature/调拨质检消息优化_1 -> develop) 禹翔辉 2025-02-26 09:25:26 +08:00
• b7331a811b Merge branch 'feature/调拨质检消息优化' into feature/调拨质检消息优化_1 yuxianghui 2025-02-26 09:23:44 +08:00
• e5d1a18640 处理质检完成时消息通知重复问题 yuxianghui 2025-02-26 09:22:50 +08:00
• 62e8634abf Accept Merge Request #1851: (feature/制造功能优化 -> develop) 马广威 2025-02-26 09:11:10 +08:00
• 2a8791b9a9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-26 09:10:04 +08:00
• def9bd2c6e 坯料自加工的切割工序状态也判断了编程状态 mgw 2025-02-26 09:09:26 +08:00
• bf785328ac Accept Merge Request #1850: (feature/mrp_bug_fixed -> develop) 胡尧 2025-02-25 17:25:26 +08:00
• 332dbce769 工单返工完成不触发制造订单的完成事件 胡尧 2025-02-25 17:25:04 +08:00
• fa2f5552e2 Accept Merge Request #1849: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-25 16:40:12 +08:00
• c400553294 工艺确认时的工单空值处理 liaodanlong 2025-02-25 16:35:40 +08:00
• 7975fd2bd2 CNC回退后需开放送检按钮 liaodanlong 2025-02-25 16:32:04 +08:00
• a0c5f9d15f 制造订单是返工状态时-上报返工的工单有【回退】入口-要隐藏问题处理 liaodanlong 2025-02-25 16:31:18 +08:00
• 2e648dea4e 成品入库单已经完成-工单还有【回退】按钮-还能回退成功 问题处理 liaodanlong 2025-02-25 16:29:58 +08:00
• 7056298420 Accept Merge Request #1848: (feature/前端样式修改 -> develop) 黄焱 2025-02-25 16:28:26 +08:00
• 3cd7a52900 去掉listRenderer含有hasSelectors时的row_no，因为td中没有序号 hyyy 2025-02-25 16:15:11 +08:00
• 5323f1076e Accept Merge Request #1847: (feature/调拨质检消息优化 -> develop) 禹翔辉 2025-02-25 15:09:55 +08:00