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

• 7b6dda3d75 重新发布按钮也增加二次确认 mgw 2025-03-13 19:17:49 +08:00
• 954ff6b848 对发布按钮进行二次确认控制 mgw 2025-03-13 19:13:57 +08:00
• af3a2880e8 添加发布前校验数据 mgw 2025-03-13 18:55:59 +08:00
• 424a496046 调整预览报表model名字 mgw 2025-03-13 18:33:26 +08:00
• bd2ba3bb49 添加合格图章 mgw 2025-03-13 17:55:13 +08:00
• 2d4926f8b7 优化上传逻辑 mgw 2025-03-13 17:23:26 +08:00
• 9d84b68525 修改报错问题 hyyy 2025-03-13 17:21:22 +08:00
• 3baf3e60e8 修复外协入库单根据图号查询不到 feature/优化调拨列表 guanhuan 2025-03-13 17:21:05 +08:00
• 16dbfc3867 限制测量列数 mgw 2025-03-13 17:13:51 +08:00
• 6de31608d1 Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 hyyy 2025-03-13 17:07:26 +08:00
• 73ce21ef99 优化，修复bug hyyy 2025-03-13 17:07:19 +08:00
• c632926348 调整报表展示 mgw 2025-03-13 17:07:07 +08:00
• a421055348 Accept Merge Request #1903: (feature/工单Rfid优化 -> develop) 禹翔辉 2025-03-13 16:47:39 +08:00
• cd114d183b 处理质检单控制方式为非数量时，调拨单验证时存在不合格质检单的提示信息数量问题 yuxianghui 2025-03-13 16:45:09 +08:00
• 20efa0bdab 去除重复声明 mgw 2025-03-13 16:44:03 +08:00
• 839b3c981d 配合前端列数修改 mgw 2025-03-13 16:39:10 +08:00
• 395db2cf5f Accept Merge Request #1904: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-13 16:21:00 +08:00
• 1ca069b149 Accept Merge Request #1905: (feature/前端样式修改 -> develop) 黄焱 2025-03-13 16:14:31 +08:00
• 061714413c Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-13 16:13:09 +08:00
• f780d47562 发布相关 mgw 2025-03-13 16:12:48 +08:00
• 082e25feae 增加添加删除列 hyyy 2025-03-13 16:10:43 +08:00
• ef5eea1845 删除无用代码 liaodanlong 2025-03-13 15:32:54 +08:00
• 359eae14cc 1、完成 制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 yuxianghui 2025-03-13 15:32:12 +08:00
• 528d63123f Accept Merge Request #1901: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-13 15:27:59 +08:00
• a11329eaf8 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-13 14:51:21 +08:00
• d571b77915 修改工单新模型显示 胡尧 2025-03-13 14:50:26 +08:00
• b94adc9704 Accept Merge Request #1902: (feature/工单Rfid优化 -> develop) 禹翔辉 2025-03-13 14:42:06 +08:00
• 2568e63712 Merge branch 'feature/制造工单优化' into feature/工单Rfid优化 yuxianghui 2025-03-13 14:40:12 +08:00
• 7ddcfc6226 1、处理 制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 ；2、处理 工单Rfid绑定解绑是数据不正确问题 yuxianghui 2025-03-13 14:39:04 +08:00
• 3543531f61 表面工艺添加零件图号零件名称 liaodanlong 2025-03-13 14:13:28 +08:00
• 04b255d5c6 检测报告发布流程 mgw 2025-03-13 14:10:06 +08:00
• 24897f07f8 获取编程单，不传递模型参数 胡尧 2025-03-13 13:58:13 +08:00
• 53779b89a7 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-13 13:06:26 +08:00
• 326dcc8b87 Accept Merge Request #1900: (feature/制造工单优化 -> develop) 禹翔辉 2025-03-13 13:05:44 +08:00
• 9d042dc61e 1、处理调拨单二次验证时其他提示信息窗口直接关闭问题；2、处理特殊途径-制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 问题 yuxianghui 2025-03-13 13:02:22 +08:00
• a1a94867f0 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-13 11:34:17 +08:00
• 7ba415968b Accept Merge Request #1899: (feature/制造工单优化 -> develop) 禹翔辉 2025-03-13 11:13:35 +08:00
• e10483b87b Merge branch 'feature/功能刀具组装提示优化' into feature/制造工单优化 yuxianghui 2025-03-13 11:12:06 +08:00
• 83699fcae6 1、修改质检提示翻译；2、处理单据合并原单据数据不全问题；3、处理制造订单返工报错 yuxianghui 2025-03-13 11:11:22 +08:00
• 0a666f568d 解决待发货获取不到模型名字的问题 胡尧 2025-03-13 10:52:14 +08:00
• b2b8762138 Accept Merge Request #1898: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-13 10:12:56 +08:00
• 7c48e6b186 同一个销售订单的不同产品的坯料获取方式不一样，生成的采购订单问题 liaodanlong 2025-03-13 09:49:17 +08:00
• ad8ec770b6 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-13 09:17:33 +08:00
• e87689da33 Accept Merge Request #1896: (feature/优化调拨列表 -> develop) 管欢 2025-03-13 08:48:04 +08:00
• 3cc3c48ab3 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-13 08:47:59 +08:00
• dff0841317 Accept Merge Request #1897: (feature/功能刀具组装提示优化 -> develop) 禹翔辉 2025-03-13 08:43:43 +08:00
• 0d8445e444 处理工单的Rfid扫码绑定解绑问题 yuxianghui 2025-03-13 08:36:10 +08:00
• f5da36a82c 修改销售订单模型显示 胡尧 2025-03-12 17:26:19 +08:00
• da489555b0 去掉多余的字段 胡尧 2025-03-12 17:17:21 +08:00
• 29337bfceb 调整模型显示 胡尧 2025-03-12 17:05:29 +08:00
• c6ae4d933c 计算总数量 mgw 2025-03-12 14:14:21 +08:00
• d577630657 增加报告相关结构 mgw 2025-03-12 14:06:03 +08:00
• 5b084624df 不送检的质量检查单状态更新：等待、待处理 liaodanlong 2025-03-12 13:46:07 +08:00
• 5e51ee8db3 控制字段、page显隐逻辑 mgw 2025-03-12 12:43:13 +08:00
• de1bdbe18b 准备前端开发用结构 mgw 2025-03-12 09:08:41 +08:00
• 78738ed8aa 检查文件上传 mgw 2025-03-11 16:19:00 +08:00
• 8237d04f32 功能刀具组装扫码验证物料提示信息优化 yuxianghui 2025-03-11 16:12:04 +08:00
• ef0d05a29d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 hyyy 2025-03-11 13:29:19 +08:00
• e6e740a6c7 质量检查优化-界面部分 mgw 2025-03-11 12:54:59 +08:00
• b8bec37e15 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-11 09:06:43 +08:00
• 003a115084 Accept Merge Request #1895: (feature/调拨单优化 -> develop) 禹翔辉 2025-03-11 08:59:33 +08:00
• 9ca7f75ef7 Merge branch 'feature/工单页签优化_1' into feature/调拨单优化 yuxianghui 2025-03-11 08:55:59 +08:00
• 7654a60f2f Accept Merge Request #1892: (feature/tool_standard_library_process -> develop) 胡尧 2025-03-11 08:55:02 +08:00
• bd43de74dd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-10 17:10:46 +08:00
• 2cc7386027 质量检查优化 mgw 2025-03-10 17:10:27 +08:00
• 4a92e39b0d Merge branch 'refs/heads/develop' into feature/tool_standard_library_process liaodanlong 2025-03-10 16:55:39 +08:00
• 34456c3506 完成 验证调拨单时，校验不合格产品，如果存在不合格质检单则给与提示 yuxianghui 2025-03-10 16:54:15 +08:00
• dedc820b50 Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-10 16:31:35 +08:00
• dc550d1be5 完成 调拨单取消后，关联取消质量检查单 yuxianghui 2025-03-10 15:24:24 +08:00
• 1541326dfc 增加排程单取消 mgw 2025-03-10 14:56:42 +08:00
• 0d7f348194 调拨列表采购订单询价单页面优化 guanhuan 2025-03-07 11:29:32 +08:00
• 2ccedc95f2 Merge branch 'feature/mrp_bug_fixed' into feature/commercially_launched 胡尧 2025-03-06 16:24:36 +08:00
• 307f1b221f Accept Merge Request #1894: (feature/mrp_bug_fixed -> develop) 胡尧 2025-03-06 16:03:14 +08:00
• 674af1d11d 成品，坯料复制模板中的采购申请字段模板 胡尧 2025-03-06 16:02:19 +08:00
• b276f616e5 成品供应商默认取模板中最后一个 胡尧 2025-03-06 14:03:31 +08:00
• cb645aa1b9 增加自动化产线的零件供货路线初始化为自动化产线加工 胡尧 2025-03-06 13:59:14 +08:00
• e12755783c 审批优化 guanhuan 2025-03-06 13:46:18 +08:00
• 1215d62e76 Accept Merge Request #1893: (feature/工单页签优化_1 -> develop) 禹翔辉 2025-03-06 13:40:34 +08:00
• 00c9ad423c Merge branch 'feature/工单页签优化' into feature/工单页签优化_1 yuxianghui 2025-03-06 13:39:27 +08:00
• 826d5b1d58 1、优化工单子页签可全量配置处理方法； yuxianghui 2025-03-06 13:37:52 +08:00
• 9a67caca74 Merge branch 'refs/heads/develop' into feature/tool_standard_library_process liaodanlong 2025-03-06 10:44:31 +08:00
• 9c5ecdfe76 sf 材料型号页面修改字段信息 liaodanlong 2025-03-06 10:25:56 +08:00
• 0a65c29286 取消销售订单的下游清单界面优化 hyyy 2025-03-05 17:24:42 +08:00
• 2409dab8b0 增加非自动化原因 胡尧 2025-03-05 14:27:41 +08:00
• f2415ae80d Accept Merge Request #1891: (feature/工单页签优化 -> develop) 禹翔辉 2025-03-05 11:26:11 +08:00
• 7d4314abc7 完成 工单子页签可全量配置 yuxianghui 2025-03-05 11:24:48 +08:00
• 28a3d52aea Accept Merge Request #1890: (feature/制造功能优化 -> develop) 马广威 2025-03-04 11:42:02 +08:00
• 7e93586f69 人工建立销售单取第一份bom mgw 2025-03-04 11:40:39 +08:00
• e8fc38e6ed Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-04 09:32:07 +08:00
• 3d355ec303 Merge branch 'release/release_2.9' master_sf_20250304_2.10 胡尧 2025-03-04 09:16:48 +08:00
• 4bff6e4355 Accept Merge Request #1889: (release/release_2.9 -> develop) release/release_2.9 马广威 2025-02-28 17:45:56 +08:00
• 98b4c53213 调整名称与提示语 mgw 2025-02-28 17:35:32 +08:00
• ec1da84da0 Accept Merge Request #1888: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-02-28 16:38:23 +08:00
• 4c8cf5caf8 制造订单状态为返工时限制表面工艺工单状态 liaodanlong 2025-02-28 16:36:16 +08:00
• aa1517ebce Accept Merge Request #1887: (release/release_2.9 -> develop) 马广威 2025-02-28 16:06:04 +08:00
• c24f539197 取消销售订单时的下游单据清单【大类、单据名称、作业类型】显示错误 mgw 2025-02-28 16:04:49 +08:00
• 72620236ab Accept Merge Request #1886: (feature/外协优化_1 -> develop) 禹翔辉 2025-02-28 08:39:01 +08:00
• eb69e20f01 Merge branch 'feature/外协优化' into feature/外协优化_1 yuxianghui 2025-02-28 08:37:41 +08:00
• 76f9b5ef3e 处理特殊表面工艺外协入库单点击【验证】报错 yuxianghui 2025-02-28 08:36:12 +08:00
• 04f697ae7b Merge branch 'develop' into release/release_2.9 胡尧 2025-02-27 17:08:59 +08:00