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

• 10e995ec7f 修改获取产量相关接口 胡尧 2025-06-16 16:25:01 +08:00
• a2f8dc6cec Accept Merge Request #2200: (feature/平台下单优化_1 -> develop) 禹翔辉 2025-06-16 16:06:06 +08:00
• fec095ca6b Merge branch 'feature/平台下单优化' into feature/平台下单优化_1 yuxianghui 2025-06-16 16:03:53 +08:00
• aed33dbb35 1、内部下单：行明细增加交期等； 2、处理 bfm平台下单-填写了合同相关字段，未上传合同，合同的相关字段未传到sf销售订单 问题 yuxianghui 2025-06-16 16:02:43 +08:00
• dbe8c95558 打印页面增加筛选 guanhuan 2025-06-16 15:43:02 +08:00
• 5c7e6e969f Accept Merge Request #2199: (feature/修改产品名称 -> develop) 胡尧 2025-06-16 15:00:42 +08:00
• d70b757487 客供料的制造订单，不显示采购申请的智能按钮 feature/修改产品名称 胡尧 2025-06-16 14:51:07 +08:00
• fb3bb8f1c0 Accept Merge Request #2198: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-16 14:44:40 +08:00
• 9123aeaee8 人工线下加工最后一个工单完工后未记录时间完工时间 guanhuan 2025-06-16 14:35:28 +08:00
• e3af0bea3c Accept Merge Request #2197: (feature/修改产品名称 -> develop) 胡尧 2025-06-16 14:25:27 +08:00
• af1bc021d6 在调拨单验证前，先进行设置数量 胡尧 2025-06-16 14:24:50 +08:00
• 2febc369bb 确认工艺路线新增表面工艺参数需要同步到产品的加工参数中 guanhuan 2025-06-16 13:44:55 +08:00
• 6ee1c5f9a9 Accept Merge Request #2196: (feature/修改产品名称 -> develop) 胡尧 2025-06-16 13:42:42 +08:00
• 5ef8023169 修改migrate脚本，解决更新慢的问题 胡尧 2025-06-16 13:41:50 +08:00
• fa03b562a2 确认工艺路线新增表面工艺参数需要同步到产品的加工参数中 guanhuan 2025-06-16 11:52:22 +08:00
• 5f55c954d1 确认工艺路线新增表面工艺参数需要同步到产品的加工参数中 guanhuan 2025-06-16 11:42:21 +08:00
• e0ca13b5b7 Accept Merge Request #2195: (feature/修改产品名称 -> develop) 胡尧 2025-06-16 10:51:28 +08:00
• dba38f4d37 修改产品名称 胡尧 2025-06-16 10:50:56 +08:00
• ceb7a02209 Accept Merge Request #2194: (feature/修改产品名称 -> develop) 胡尧 2025-06-16 09:36:16 +08:00
• 1811dbf0fd 解决修改产品名称带来的影响 胡尧 2025-06-16 09:33:52 +08:00
• 1c1d1a74ad Accept Merge Request #2193: (feature/修改产品名称 -> develop) 胡尧 2025-06-16 09:21:06 +08:00
• 347019d7ee 修改产品名称生成规则 胡尧 2025-06-16 09:20:32 +08:00
• 7d46d00fd7 Accept Merge Request #2192: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-16 08:53:35 +08:00
• 5a22402e7a Accept Merge Request #2191: (feature/修改产品名称 -> develop) 胡尧 2025-06-13 17:55:13 +08:00
• f53e34aeb4 修改接口授权后，没有赋予用户的bug，导致无法获取公司，增加替换sf销售订单行产品名称的模块 胡尧 2025-06-13 17:53:57 +08:00
• e145e8a3a4 下发时修改需求计划的总预计加工时间 guanhuan 2025-06-13 15:40:02 +08:00
• 0ef6fe73f3 Accept Merge Request #2190: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-13 14:24:29 +08:00
• ffad4b7995 修复坯料的采购申请按钮没显示 guanhuan 2025-06-13 14:17:48 +08:00
• 2c7fbd3aef 修复坯料的采购申请按钮没显示 guanhuan 2025-06-13 10:41:57 +08:00
• 72b8d33a3e Accept Merge Request #2189: (feature/功能刀具组装支持搜索更多物料 -> develop) 禹翔辉 2025-06-13 10:21:32 +08:00
• 6517d2bd12 功能刀具组装点【更多】按钮弹窗的物料添加【BOM物料】默认筛选，根据BOM筛选出符合条件的物料信息；取消默认筛选后记录按满足BOM的和不满足BOM的顺序排序出现。 yuxianghui 2025-06-13 10:19:11 +08:00
• 2c97287218 下达生产修改 guanhuan 2025-06-13 10:05:33 +08:00
• 012ff120b4 Accept Merge Request #2188: (hotfix/修复刀具预警没有预警记录和通知 -> develop) 胡尧 2025-06-13 08:41:05 +08:00
• 960f05090c Accept Merge Request #2187: (feature/6973 -> develop) 胡梓杨 2025-06-12 15:48:03 +08:00
• 6321e7ef23 货位看板详情回退修复，删除幽灵卡片。 feature/6973 huziyang@jikimo.com 2025-06-12 15:38:56 +08:00
• 69d200973b Accept Merge Request #2186: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-12 10:57:11 +08:00
• 448a2cd277 需求计划对应产品的调拨单显示不正确 guanhuan 2025-06-12 10:54:07 +08:00
• 5a071188cc 需求计划对应产品的调拨单显示不正确 guanhuan 2025-06-12 10:53:46 +08:00
• b8894609a9 功能刀具寿命到期消息通知 release/release_2.14 hotfix/修复刀具预警没有预警记录和通知 yuxianghui 2025-06-12 10:10:13 +08:00
• 3f8fd6da62 创建刀具拆解单判断条件优化 yuxianghui 2025-06-12 09:40:32 +08:00
• 154a17657c 需求计划材料销售订单行取值问题 guanhuan 2025-06-12 09:35:39 +08:00
• 62ead52f00 处理功能刀具预警时没有创建功能刀具预警记录和功能刀具拆解单bug yuxianghui 2025-06-11 17:18:59 +08:00
• 23d6e38b24 Accept Merge Request #2185: (hotfix/备注为空 -> develop) 管欢 2025-06-11 16:02:38 +08:00
• bdc23afc56 Accept Merge Request #2184: (feature/齐套检查与下达生产 -> develop) 管欢 2025-06-11 13:51:01 +08:00
• b8043b3ad2 修复多条采购申请跳转报错 guanhuan 2025-06-11 11:41:03 +08:00
• 8841d800ea Merge branch 'hotfix/备注为空' into release/release_2.14 胡尧 2025-06-11 11:28:35 +08:00
• 920e96ffc6 修复备注为空 hotfix/备注为空 guanhuan 2025-06-11 11:19:31 +08:00
• d52f5fa841 修复取消订单时报错bug yuxianghui 2025-06-11 11:15:03 +08:00
• 37c5c9d498 需求计划列表拖动 guanhuan 2025-06-11 10:40:26 +08:00
• 6867d7e4ce 需求计划合同号 guanhuan 2025-06-11 09:48:53 +08:00
• 9cbd311fec Accept Merge Request #2183: (feature/需求计划 -> develop) 管欢 2025-06-11 09:22:25 +08:00
• 0e753b1c85 命名修改 feature/需求计划 guanhuan 2025-06-11 08:59:41 +08:00
• 48316c55b7 命名修改 guanhuan 2025-06-11 08:57:51 +08:00
• b33ba9c354 命名修改 guanhuan 2025-06-11 08:56:44 +08:00
• e0559e9887 Merge branch 'develop' into release/release_2.14 胡尧 2025-06-10 16:33:57 +08:00
• 39a25bb6c8 Accept Merge Request #2180: (feature/搜索优化 -> develop) 管欢 2025-06-10 16:33:37 +08:00
• 796e9b0cef 需求计划新增合同日期等字段 guanhuan 2025-06-10 15:49:22 +08:00
• e129c08426 Accept Merge Request #2179: (feature/bfm下单接口优化 -> develop) 禹翔辉 2025-06-10 15:28:17 +08:00
• c6b47bd68d 销售订单新增合同日期字段 yuxianghui 2025-06-10 15:26:32 +08:00
• 126d60f8d7 Merge branch 'refs/heads/feature/搜索优化' into release/release_2.14 guanhuan 2025-06-10 10:45:52 +08:00
• 4225a8fe1b 采购申请单完成操作提示调整 feature/搜索优化 guanhuan 2025-06-10 10:45:06 +08:00
• a13a79f41f Merge branch 'refs/heads/feature/搜索优化' into release/release_2.14 guanhuan 2025-06-09 17:56:50 +08:00
• a828c823dd 采购申请单完成操作修改 guanhuan 2025-06-09 17:55:34 +08:00
• 9cf2bac9c6 修复返工问题 guanhuan 2025-06-09 17:39:55 +08:00
• 1926375d58 需求计划文件打印 guanhuan 2025-06-09 10:30:12 +08:00
• 23dd88b7ba 解决冲突 huziyang@jikimo.com 2025-06-09 10:01:57 +08:00
• f164488e48 屏蔽OCC导入 huziyang@jikimo.com 2025-06-09 09:59:47 +08:00
• 25b53794bb 处理#6973任务： 1货位编码规则简化 2货位看板直观化展示 huziyang@jikimo.com 2025-06-09 09:49:21 +08:00
• 484fab85be Accept Merge Request #2176: (feature/6694 -> develop) 胡尧 2025-06-09 09:09:06 +08:00
• 6ed5de6400 修改出厂检验报告预览数据 feature/6694 胡尧 2025-06-09 09:08:26 +08:00
• 8224f36567 需求计划页面显示 guanhuan 2025-06-06 15:24:12 +08:00
• 2449b92bc8 Accept Merge Request #2175: (feature/6694 -> develop) 胡尧 2025-06-06 09:34:15 +08:00
• 03ec94d223 修复点击智能按钮点击的问题 胡尧 2025-06-06 09:33:23 +08:00
• d26e6edd31 Accept Merge Request #2174: (feature/6694 -> develop) 胡尧 2025-06-06 09:17:06 +08:00
• 2ea24f2049 修改制造订单的采购申请只能按钮判断规则 胡尧 2025-06-06 09:16:41 +08:00
• b11b6ef283 合同编号显示 guanhuan 2025-06-06 09:11:03 +08:00
• b1a04f8f44 Accept Merge Request #2173: (feature/6694 -> develop) 胡尧 2025-06-06 08:37:58 +08:00
• 0b5415dc47 在出厂检验报告验证数量时，增加产品的匹配 胡尧 2025-06-06 08:37:38 +08:00
• 59569806e6 Accept Merge Request #2172: (feature/6694 -> develop) 胡尧 2025-06-06 08:29:51 +08:00
• 4e1be6f4d5 修复二次弹窗不能刷新页面的问题，但是js方法还需要修改 胡尧 2025-06-06 08:29:25 +08:00
• cdf8fbb12a Accept Merge Request #2171: (feature/销售合同优化 -> develop) 禹翔辉 2025-06-05 17:03:44 +08:00
• 5d0f094da7 1 yuxianghui 2025-06-05 17:03:06 +08:00
• 865d2216af 未齐套提示按钮修改 guanhuan 2025-06-05 17:02:39 +08:00
• 95cb5251dc 1、销售订单添加合同编号字段，bfm下单接口添加合同编号同步；2、优化解除装夹工单完工时解绑rfid逻辑，优化工单返工时新工单绑定rfid逻辑 yuxianghui 2025-06-05 16:59:33 +08:00
• 1d01e3ad2e 未齐套提示 guanhuan 2025-06-05 16:17:18 +08:00
• c8fe7504c7 Accept Merge Request #2170: (feature/销售合同优化 -> develop) 禹翔辉 2025-06-05 15:35:03 +08:00
• 222efc57c2 返工优化 yuxianghui 2025-06-05 15:29:14 +08:00
• 735d5c659d Accept Merge Request #2169: (feature/销售合同优化 -> develop) 禹翔辉 2025-06-05 14:53:53 +08:00
• 50d188b737 处理自动化产线的确认工艺路线报错 yuxianghui 2025-06-05 14:49:09 +08:00
• af3ea0f702 Accept Merge Request #2168: (feature/销售合同优化 -> develop) 禹翔辉 2025-06-05 13:59:35 +08:00
• 8bf3b68cee 处理批量修改采购申请报错 yuxianghui 2025-06-05 13:52:25 +08:00
• 2766bc7d34 Accept Merge Request #2167: (feature/销售合同优化 -> develop) 禹翔辉 2025-06-05 11:20:09 +08:00
• 1082384d00 清除返工工单的rfid，并保留记录 yuxianghui 2025-06-05 11:18:47 +08:00
• 25aab1576d 返工装夹预调工单时，清除同一个面工单的rfid，并且保留返工工单的rfid记录 yuxianghui 2025-06-05 11:11:54 +08:00
• 87891b45ef Accept Merge Request #2165: (feature/销售合同优化 -> develop) 禹翔辉 2025-06-05 10:23:23 +08:00
• b2cfdd8d78 Accept Merge Request #2166: (feature/6694 -> develop) 胡尧 2025-06-05 10:21:11 +08:00
• 540b7bcbea 修改质检单字段显示 胡尧 2025-06-05 10:19:58 +08:00
• c6cb1d367d 处理返工报错 yuxianghui 2025-06-05 10:17:39 +08:00
• 6c8677e9e6 修改服务地址 feature/pre-three-elment 胡尧 2025-06-05 09:40:18 +08:00
• 001900bd65 Accept Merge Request #2164: (feature/销售合同优化 -> develop) 禹翔辉 2025-06-05 09:19:28 +08:00