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

• e6d8ebb7b3 修改 胡尧 2025-05-15 14:39:40 +08:00
• 3663e04b34 Accept Merge Request #2126: (feature/6694 -> develop) 胡尧 2025-05-15 12:14:51 +08:00
• c2e4085b50 解决产品模板复制的问题 胡尧 2025-05-15 12:14:33 +08:00
• 33c881b12f Accept Merge Request #2125: (feature/6694 -> develop) 胡尧 2025-05-15 11:07:51 +08:00
• c80e12d731 回退工艺外协代码 胡尧 2025-05-15 11:07:22 +08:00
• 5446ef18e2 回退代码 胡尧 2025-05-15 10:36:38 +08:00
• 9c4d545915 Merge branch 'develop' into feature/6694 胡尧 2025-05-15 10:33:42 +08:00
• 61baa49d85 Merge branch 'feature/6694' into feature/merge-6694 feature/merge-6694 胡尧 2025-05-15 09:22:44 +08:00
• 063c7a94c5 Accept Merge Request #2121: (feature/rollback-develop1 -> develop) 胡尧 2025-05-15 09:15:54 +08:00
• b783af6ef3 修复误回退的代码 胡尧 2025-05-15 09:15:27 +08:00
• 22cbe1bd9d 回退代码 胡尧 2025-05-15 09:13:51 +08:00
• cc196e25da Accept Merge Request #2120: (feature/rollback-develop1 -> develop) 胡尧 2025-05-15 09:03:49 +08:00
• 961754428b 退回至未合并工艺外协代码 胡尧 2025-05-15 09:02:31 +08:00
• e8a968c5a7 修改工单获取前置三元检测方法 胡尧 2025-05-15 08:45:55 +08:00
• f6d8cb6267 编程单增加零件图号 胡尧 2025-05-15 08:45:02 +08:00
• 7e47a85167 Accept Merge Request #2119: (feature/tool_standard_library_process -> develop) feature/backup-develop 廖丹龙 2025-05-14 17:53:14 +08:00
• 2644df4fd5 sf-制造-工艺外协的采购订单确认后，外协的调拨单的作业详情的预留数量跟完成数量不对 feature/tool_standard_library_process liaodanlong 2025-05-14 17:45:42 +08:00
• c898e02860 解决制造申请字段未复制到成品中 胡尧 2025-05-14 17:02:04 +08:00
• e14aa35d90 Accept Merge Request #2118: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-05-14 17:00:42 +08:00
• 9392819375 sf-制造-工艺外协的采购订单确认后，外协的调拨单的作业详情的预留数量跟完成数量不对 liaodanlong 2025-05-14 16:58:05 +08:00
• ea3d9e5375 sf-制造-工艺外协的采购订单确认后，外协的调拨单的作业详情的预留数量跟完成数量不对 liaodanlong 2025-05-14 16:46:29 +08:00
• 7db0a44420 Accept Merge Request #2117: (feature/6694 -> develop) 胡尧 2025-05-14 16:09:30 +08:00
• 5477582a69 修改中控日志接口授权为none 胡尧 2025-05-14 16:09:06 +08:00
• 238840b647 sf-制造-工艺外协的采购订单确认后，外协的调拨单的作业详情的预留数量跟完成数量不对 liaodanlong 2025-05-14 14:54:36 +08:00
• 51e25d8847 Accept Merge Request #2116: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-05-14 14:14:02 +08:00
• c6f06a4c32 外协调拨单就绪条件修改 liaodanlong 2025-05-14 14:12:06 +08:00
• 5b61a801c5 空值判断 liaodanlong 2025-05-14 13:57:57 +08:00
• 2893524902 Accept Merge Request #2115: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-05-14 12:22:10 +08:00
• ed55e36f45 sf-制造-产品-表单详情中-工艺参数显示内容=未归档，未绑定产品的工艺参数 liaodanlong 2025-05-14 11:49:14 +08:00
• c811f26104 Accept Merge Request #2114: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-05-14 11:11:29 +08:00
• 3763b60758 sf-制造-产品-表单详情中-工艺参数显示内容=未归档，未绑定产品的工艺参数 liaodanlong 2025-05-14 10:48:01 +08:00
• 976907bd92 Accept Merge Request #2112: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-05-14 10:35:47 +08:00
• 50c3b31ece 外协采购单使用采购申请创建出来的采购单 liaodanlong 2025-05-14 10:24:21 +08:00
• 8afc8bb3a6 外协调拨单只有当制造订单状态变为已编程才能就绪 liaodanlong 2025-05-14 10:03:26 +08:00
• a0427d424f Accept Merge Request #2111: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-05-13 16:35:45 +08:00
• 3148ce5a15 外协调拨单不同产品的调拨单混合到一起了 liaodanlong 2025-05-13 15:49:02 +08:00
• 8e726e1bf6 sf-制造-工艺外协的采购订单确认后，外协的调拨单的作业详情的预留数量跟完成数量不对 liaodanlong 2025-05-13 15:01:54 +08:00
• 4c0f9cfb39 外协工单零件图号零件名称 liaodanlong 2025-05-13 11:04:45 +08:00
• 86d3bd38c5 Accept Merge Request #2110: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-05-13 10:25:20 +08:00
• a8e4c7d9a0 调拨单报错问题处理 liaodanlong 2025-05-13 10:24:09 +08:00
• 7501832637 调拨单就绪问题处理 liaodanlong 2025-05-13 10:01:58 +08:00
• ce0ead4da6 sf-工序-手动创建工艺可选参数及产品问题 liaodanlong 2025-05-12 17:13:52 +08:00
• 343e2f9f24 Accept Merge Request #2109: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-05-12 15:42:10 +08:00
• 6d3793ee30 调拨单就绪问题处理 liaodanlong 2025-05-12 15:21:10 +08:00
• 9cb22d810e 增加接口日志 胡尧 2025-05-12 15:14:04 +08:00
• 43f7e97c28 Accept Merge Request #2108: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-05-12 15:12:06 +08:00
• 9e6f3fa864 Merge branch 'refs/heads/develop' into feature/tool_standard_library_process liaodanlong 2025-05-12 15:03:25 +08:00
• ed50d7c9a7 调拨单就绪问题处理 liaodanlong 2025-05-12 14:55:19 +08:00
• 89e23050e6 打印错误日志堆栈信息 liaodanlong 2025-05-12 14:54:43 +08:00
• b7f912453f Accept Merge Request #2107: (feature/6694 -> develop) 胡尧 2025-05-12 14:48:07 +08:00
• cab6b6fa2a 解决代码问题 胡尧 2025-05-12 14:46:15 +08:00
• 35bf954529 增加中控接口调用日志记录 胡尧 2025-05-12 11:50:35 +08:00
• 1040844b0a 采购申请跳转处理 liaodanlong 2025-05-12 11:01:51 +08:00
• 36a13c04de 采购申请数量与产品数量不一致问题 liaodanlong 2025-05-12 10:55:21 +08:00
• f4318bd997 Merge remote-tracking branch 'origin/feature/tool_standard_library_process' into feature/tool_standard_library_process liaodanlong 2025-05-12 10:25:09 +08:00
• d47a30977c 已归档的表面工艺可选参数不进行产品创建 liaodanlong 2025-05-12 10:24:22 +08:00
• ceb38aa483 Accept Merge Request #2106: (feature/tool_standard_library_process -> develop) 胡尧 2025-05-12 08:41:26 +08:00
• 11ecad5ef2 解决冲突 胡尧 2025-05-12 08:41:12 +08:00
• 8249d1427f Accept Merge Request #2105: (feature/采购申请优化 -> develop) 管欢 2025-05-09 18:28:56 +08:00
• 76902bee9a Merge branch 'refs/heads/feature/采购申请优化' into release/release_2.13 release/release_2.13 guanhuan 2025-05-09 18:16:04 +08:00
• 94bcfc0543 采购申请数量修改过滤取消 feature/采购申请优化 guanhuan 2025-05-09 18:15:40 +08:00
• 34ecb648ef Merge branch 'refs/heads/feature/采购申请优化' into release/release_2.13 guanhuan 2025-05-09 17:51:35 +08:00
• b4d31c7c4b 采购申请数量修改 guanhuan 2025-05-09 17:50:43 +08:00
• 61bcd72a41 表面工艺外协调拨单数量问题 master_sf_20250509_2.14 feature/sync-develop-with-master 胡尧 2025-05-09 17:24:24 +08:00
• d7f7bb9a57 Accept Merge Request #2104: (release/release_2.13 -> develop) 胡尧 2025-05-09 15:26:50 +08:00
• ee87e1dacf 处理特殊表面工艺采购单确认报错的问题 胡尧 2025-05-09 15:26:12 +08:00
• 2f6c41c999 Accept Merge Request #2103: (release/release_2.13 -> develop) 胡尧 2025-05-09 14:58:09 +08:00
• d0d4db1555 修改制造目录文件结构 胡尧 2025-05-09 14:57:35 +08:00
• 62cbb4b796 Merge branch 'develop' into release/release_2.13 胡尧 2025-05-09 14:08:06 +08:00
• f040406002 Accept Merge Request #2102: (feature/6694 -> develop) 胡尧 2025-05-09 13:43:36 +08:00
• bfff4ac440 确认接收时，将不追溯的产品的完成数量自动填上 胡尧 2025-05-09 13:43:10 +08:00
• a97386c37c Accept Merge Request #2101: (feature/6694 -> develop) 胡尧 2025-05-09 10:34:59 +08:00
• 18ae46207a 调整质检单字段 胡尧 2025-05-09 10:34:23 +08:00
• bacddd2ad8 修改字段翻译 胡尧 2025-05-09 08:47:33 +08:00
• dd5794899d Accept Merge Request #2100: (feature/6694 -> develop) 胡尧 2025-05-08 21:22:21 +08:00
• e5b730b2ef 人工线下返工在不选择重新编程时复制加工图纸 胡尧 2025-05-08 21:21:51 +08:00
• aea158de41 质检单数量约束 胡尧 2025-05-08 20:32:59 +08:00
• a933a0ffea Accept Merge Request #2099: (feature/6694 -> develop) 胡尧 2025-05-08 20:13:20 +08:00
• 7575424760 委外加工的入库单增加采购申请按钮 胡尧 2025-05-08 20:12:12 +08:00
• 6c2eb40e6a Accept Merge Request #2098: (feature/6694 -> develop) 胡尧 2025-05-08 17:48:05 +08:00
• f10f595fa4 解决制造订单不显示采购申请按钮的问题 胡尧 2025-05-08 17:47:40 +08:00
• 6d1de42d76 Accept Merge Request #2097: (feature/6694 -> develop) 胡尧 2025-05-08 17:30:19 +08:00
• 5dc16c039c 修复收料入库单明细不对的问题 胡尧 2025-05-08 17:29:41 +08:00
• c416cdbeed Accept Merge Request #2096: (feature/6694 -> develop) 胡尧 2025-05-08 16:47:22 +08:00
• 18c7b22319 取消采购申请合并明细行的代码，会导致其他后续单据的问题 胡尧 2025-05-08 16:47:01 +08:00
• b5339046b9 工艺外协代码 liaodanlong 2025-05-08 16:42:18 +08:00
• e0ba222382 Accept Merge Request #2095: (feature/6694 -> develop) 胡尧 2025-05-08 15:57:52 +08:00
• 58b00e6442 解决计算字段报错的问题 胡尧 2025-05-08 15:57:16 +08:00
• 9182dbfb5d Accept Merge Request #2094: (feature/6694 -> develop) 胡尧 2025-05-08 15:20:48 +08:00
• 27516844af 修复质检的bug 胡尧 2025-05-08 15:20:08 +08:00
• 99237445ac 修复质检的bug 胡尧 2025-05-08 15:17:01 +08:00
• 9349ca91d3 Accept Merge Request #2093: (feature/采购申请优化 -> develop) 管欢 2025-05-08 09:18:28 +08:00
• 51c517145b 工艺外协代码 liaodanlong 2025-05-07 17:17:41 +08:00
• c55f3d77bf Merge branch 'refs/heads/feature/采购申请优化' into release/release_2.13 guanhuan 2025-05-07 16:45:18 +08:00
• 95716c2e3e 采购申请明细优化 guanhuan 2025-05-07 16:44:48 +08:00
• 5f72519dc2 Accept Merge Request #2092: (feature/6694 -> develop) 胡尧 2025-05-07 16:35:22 +08:00
• c24bba3137 增加采购申请对于单件制造非首个制造订单的显示，修改采购申请对于同一个补货组同一个产品的合并 胡尧 2025-05-07 16:34:45 +08:00
• 01bb6fd0aa Merge branch 'refs/heads/feature/采购申请优化' into release/release_2.13 guanhuan 2025-05-07 16:04:47 +08:00
• bf4add6b78 采购申请明细优化 guanhuan 2025-05-07 16:02:39 +08:00
• 51a8964b89 修复出厂检验质检单详情手动新增明细行后右边的【删除】按钮显示不全 hyyy 2025-05-07 15:48:05 +08:00