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

• 5c5b8fb8fd Merge branch 'feature/库存优化_6' into feature/调拨质检消息优化 yuxianghui 2025-02-25 15:06:38 +08:00
• fb4f08a24a 1、处理销售订单确认供货路线报错-坯料获取方式是自加工 问题；2、质检完成的消息通知添加超链接；3、添加 库存作业单据没有质检单时-会发送待处理消息通知-不用发送判断条件 yuxianghui 2025-02-25 15:05:30 +08:00
• f3e5901474 Accept Merge Request #1846: (feature/库存优化_6 -> develop) 禹翔辉 2025-02-25 11:30:39 +08:00
• 247036209e Merge branch 'feature/库存优化_5' into feature/库存优化_6 yuxianghui 2025-02-25 11:23:23 +08:00
• 0fd33831f1 处理由客供料入库单生成的质检单没有批次序列号问题 yuxianghui 2025-02-25 11:22:41 +08:00
• 78b58d4fb8 Accept Merge Request #1845: (feature/库存优化_5 -> develop) 禹翔辉 2025-02-25 10:33:39 +08:00
• 6e94dc45a9 Merge branch 'feature/质检消息优化' into feature/库存优化_5 yuxianghui 2025-02-25 10:31:00 +08:00
• 7ecb28382a 1、库存序列号的更新序列号功能按钮优化；2、销售单默认显示字段优化； yuxianghui 2025-02-25 10:28:51 +08:00
• 7a0b8f0c78 Accept Merge Request #1844: (feature/质检消息优化 -> develop) 禹翔辉 2025-02-25 09:32:43 +08:00
• ee42b6ae70 Merge branch 'feature/库存优化_3' into feature/质检消息优化 yuxianghui 2025-02-25 08:45:54 +08:00
• e8c0011fbc Accept Merge Request #1843: (feature/制造功能优化 -> develop) 马广威 2025-02-24 17:01:31 +08:00
• e2e9637dbf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-24 16:59:33 +08:00
• 3745125990 编程单去重 mgw 2025-02-24 16:59:12 +08:00
• 83fb8a6625 质检完成消息通知发送失败 优化 yuxianghui 2025-02-24 16:53:43 +08:00
• 014456f09f Accept Merge Request #1842: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-24 16:50:08 +08:00
• 7a3534f8e4 当前工单下一张工单为表面工艺时不显示回退按钮问题处理 liaodanlong 2025-02-24 16:39:10 +08:00
• 08c7226add Accept Merge Request #1840: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-24 16:31:56 +08:00
• de43411e53 Accept Merge Request #1841: (feature/库存优化_3 -> develop) 禹翔辉 2025-02-24 16:29:40 +08:00
• 8c14ea4a85 Merge branch 'feature/库存功能优化' into feature/库存优化_3 yuxianghui 2025-02-24 16:27:49 +08:00
• eb11e71d0d 1、入库单据优化：单据就绪自动分配序列号；分配序列号时，流水号取值=MAX（产品序列号模型最大序号，预分配最大序号），界面优化。2、客供料入库单批量调拨有待质检的单子时-提示语显示重复了优化 yuxianghui 2025-02-24 16:27:09 +08:00
• 71e7ac9993 最后一个解除装夹未隐藏回退按钮 liaodanlong 2025-02-24 16:16:00 +08:00
• 749df39809 cnc工单没有回退按钮问题 liaodanlong 2025-02-24 16:08:22 +08:00
• 332ac49229 Accept Merge Request #1839: (feature/制造功能优化 -> develop) 马广威 2025-02-24 15:29:53 +08:00
• fea58e6288 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-24 15:29:20 +08:00
• 28a16ca08e 调整工单名称、编程单去重 mgw 2025-02-24 15:29:02 +08:00
• 363169d9e4 Accept Merge Request #1838: (feature/制造功能优化 -> develop) 马广威 2025-02-24 15:15:47 +08:00
• 74442c6539 改正语法问题 mgw 2025-02-24 15:15:27 +08:00
• d247b25d55 Accept Merge Request #1837: (feature/制造功能优化 -> develop) 马广威 2025-02-24 15:13:09 +08:00
• b2b6a57f40 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-24 15:12:40 +08:00
• 4e7bf40d91 调整领料单生成次数 mgw 2025-02-24 15:12:23 +08:00
• 2baf739eb2 Accept Merge Request #1836: (feature/制造功能优化 -> develop) 马广威 2025-02-24 15:00:23 +08:00
• 7ab90143b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-24 14:59:53 +08:00
• 8bf788e39c 调整行号取值 mgw 2025-02-24 14:57:19 +08:00
• 2e83a22540 Accept Merge Request #1835: (feature/制造功能优化 -> develop) 马广威 2025-02-24 14:47:28 +08:00
• 9e25657fea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-24 14:46:35 +08:00
• 555802b271 调整下游单据内容 mgw 2025-02-24 14:46:18 +08:00
• 4002588eec Accept Merge Request #1834: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-24 14:05:38 +08:00
• 09ba001b06 sf-生产环境-客供料入库单-合并后的客供料入库单的零件图号显示名称不正确 liaodanlong 2025-02-24 13:38:02 +08:00
• c208bac3a1 Accept Merge Request #1833: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-24 09:45:27 +08:00
• 7efea85420 刀具标准库 基本参数修改字段默认隐藏，并可勾选展示 liaodanlong 2025-02-24 09:30:27 +08:00
• 91061b1eec 调整调拨产品名称等 mgw 2025-02-21 17:34:57 +08:00
• 3c349c3346 Accept Merge Request #1832: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-21 16:47:25 +08:00
• e1185aa28b 子制造订单回退功能处理 处理解除装夹没有回退按钮 liaodanlong 2025-02-21 15:22:00 +08:00
• e2edd38a8e Accept Merge Request #1831: (feature/mrp_bug_fixed -> develop) 胡尧 2025-02-21 14:48:34 +08:00
• 16b5ce300a 修复库存有两个驾驶舱菜单的bug 胡尧 2025-02-21 14:48:01 +08:00
• 70855a4936 Accept Merge Request #1830: (feature/mrp_bug_fixed -> develop) 胡尧 2025-02-21 14:29:46 +08:00
• 1bbdf2bd44 取消配送路线关联字段修改 胡尧 2025-02-21 14:29:15 +08:00
• 3da67f27ec Accept Merge Request #1829: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-21 10:30:16 +08:00
• d8e8babbd3 工单详情添加回退按钮 liaodanlong 2025-02-21 10:28:12 +08:00
• 41deefa4f3 Accept Merge Request #1828: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-21 09:00:21 +08:00
• acfc09596b 刀具编码修改 liaodanlong 2025-02-20 17:21:44 +08:00
• 5d00c1018b Accept Merge Request #1827: (feature/取消加工订单 -> develop) 管欢 2025-02-20 16:28:20 +08:00
• a438ba9c40 Accept Merge Request #1826: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-20 16:13:43 +08:00
• c3f5a890f1 工厂编码修改 liaodanlong 2025-02-20 16:12:59 +08:00
• 416a63138a Merge branch 'refs/heads/develop' into feature/tool_standard_library_process liaodanlong 2025-02-20 15:48:22 +08:00
• 75460c5df6 制造订单 工单回退 liaodanlong 2025-02-20 15:38:37 +08:00
• 162a1061de 制造订单 工单回退 liaodanlong 2025-02-20 14:08:06 +08:00
• 52e585e637 解决冲突 胡尧 2025-02-20 13:51:24 +08:00
• 05dac9fb0c 调整模型上传的流程 胡尧 2025-02-20 13:36:05 +08:00
• cb2777ba3e Accept Merge Request #1825: (feature/前端样式修改 -> develop) 黄焱 2025-02-20 11:37:34 +08:00
• e6ab17ca0d sf-制造-功能刀具标准库字段样式调整 hyyy 2025-02-20 11:34:19 +08:00
• 8e27ee2434 修复取消订单状态已更新时的提示 feature/取消加工订单 guanhuan 2025-02-20 10:25:56 +08:00
• 1ca61b2346 Accept Merge Request #1824: (feature/库存功能优化 -> develop) 禹翔辉 2025-02-20 10:06:34 +08:00
• 087896aa1c Merge branch 'feature/调拨质检完成消息通知' into feature/库存功能优化 yuxianghui 2025-02-20 10:05:05 +08:00
• 7ff1fed4b6 调拨单批量调拨功能，新增调拨单的质检单是否完成校验 yuxianghui 2025-02-20 10:04:22 +08:00
• 74c747b3ef Accept Merge Request #1823: (feature/调拨质检完成消息通知 -> develop) 禹翔辉 2025-02-19 16:24:26 +08:00
• 996f25232b Merge branch 'feature/质检返工优化' into feature/调拨质检完成消息通知 yuxianghui 2025-02-19 16:22:51 +08:00
• cddcec4225 添加调拨单的质检完成的消息通知 yuxianghui 2025-02-19 16:22:00 +08:00
• a30ee546bd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-19 15:35:40 +08:00
• 045faeae89 Accept Merge Request #1822: (feature/制造功能优化 -> develop) 马广威 2025-02-19 15:35:29 +08:00
• 064af3b884 调整名称 mgw 2025-02-19 15:34:42 +08:00
• a783d54836 Accept Merge Request #1821: (feature/制造功能优化 -> develop) 马广威 2025-02-19 15:15:39 +08:00
• 55a118f19a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-19 15:14:24 +08:00
• 0969967570 修复完善取消订单问题 mgw 2025-02-19 15:14:05 +08:00
• 85f19defa8 Accept Merge Request #1820: (feature/合同审批 -> develop) 管欢 2025-02-19 14:50:15 +08:00
• a628826b52 采购协议 guanhuan 2025-02-19 11:34:58 +08:00
• bdccce07d4 采购协议 guanhuan 2025-02-19 11:31:46 +08:00
• 4dc19cab81 采购协议 guanhuan 2025-02-19 10:42:48 +08:00
• 986b727d9b Accept Merge Request #1818: (feature/前端样式修改 -> develop) 黄焱 2025-02-19 10:36:52 +08:00
• 9e6fc3bacb 增加样式权重 hyyy 2025-02-19 10:29:25 +08:00
• 201bab304d Accept Merge Request #1817: (feature/前端样式修改 -> develop) 黄焱 2025-02-18 16:24:30 +08:00
• 6984f31547 删除多余代码 hyyy 2025-02-18 16:23:25 +08:00
• 6f4f0ab0fb 增加刀具管理的展开列 hyyy 2025-02-18 15:44:40 +08:00
• a4b40bee16 Accept Merge Request #1816: (feature/制造功能优化 -> develop) 马广威 2025-02-17 18:00:29 +08:00
• dc29671f1a 增加状态映射 mgw 2025-02-17 17:59:38 +08:00
• 1ca68d9ff2 Accept Merge Request #1815: (feature/制造功能优化 -> develop) 马广威 2025-02-17 17:35:57 +08:00
• 9fce93e1ef 调整工单状态改变逻辑 mgw 2025-02-17 17:34:54 +08:00
• 732c2089b9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-17 17:30:21 +08:00
• 09f8f5c0fd 调整状态 mgw 2025-02-17 17:30:02 +08:00
• 74290a060e Accept Merge Request #1814: (feature/质检返工优化 -> develop) 禹翔辉 2025-02-17 17:17:18 +08:00
• 6388072bed Merge branch 'feature/库存优化_2' into feature/质检返工优化 yuxianghui 2025-02-17 17:16:11 +08:00
• 71cbd7ac36 1、优化由质检返工生成的制造订单检测结果数据不全的问题；2、 发票账单：增加字段及优化 yuxianghui 2025-02-17 17:15:30 +08:00
• c77c6310a2 Accept Merge Request #1813: (feature/制造功能优化 -> develop) 马广威 2025-02-17 16:21:54 +08:00
• 5d13c09468 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-17 16:21:20 +08:00
• f24c5ff75a 调整字段名称 mgw 2025-02-17 16:21:01 +08:00
• 902857444b Accept Merge Request #1812: (feature/制造功能优化 -> develop) 马广威 2025-02-17 16:16:14 +08:00
• fafa12dd23 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-02-17 16:12:20 +08:00
• 8d9aee497a 完善取消订单功能 mgw 2025-02-17 16:11:48 +08:00
• 27820837c4 Accept Merge Request #1811: (feature/前端样式修改 -> develop) 黄焱 2025-02-17 16:06:47 +08:00
• 69c5996db7 合并销售订单列，修改必填*展示方法， hyyy 2025-02-17 16:03:14 +08:00