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

• 001900bd65 Accept Merge Request #2164: (feature/销售合同优化 -> develop) 禹翔辉 2025-06-05 09:19:28 +08:00
• 0204e0e24f Merge branch 'feature/采购消息通知' into feature/销售合同优化 yuxianghui 2025-06-05 09:17:26 +08:00
• 2b3a2dd21c 1、处理返工报错，2、保存的合同文档添加对应销售订单号 yuxianghui 2025-06-05 09:16:02 +08:00
• 57acad4716 Accept Merge Request #2163: (feature/6694 -> develop) 胡尧 2025-06-05 09:15:46 +08:00
• 9f97c82a46 调整采购申请菜单位置 胡尧 2025-06-05 09:15:25 +08:00
• 7cafddd345 Accept Merge Request #2162: (feature/6694 -> develop) 胡尧 2025-06-05 08:59:10 +08:00
• c796697a8e 修改出厂检验报告重新发布按钮，增加确认提示 胡尧 2025-06-05 08:56:34 +08:00
• ee523e9aac Accept Merge Request #2161: (feature/6694 -> develop) 胡尧 2025-06-04 17:36:24 +08:00
• 87fdc7bf74 出厂检验报告发布按钮增加判断 胡尧 2025-06-04 17:35:57 +08:00
• fc41f30244 未齐套提示 guanhuan 2025-06-04 17:31:10 +08:00
• fbcd8c57c5 未齐套提示 guanhuan 2025-06-04 16:38:46 +08:00
• e7d84e9df2 Accept Merge Request #2160: (feature/采购消息通知 -> develop) 禹翔辉 2025-06-04 16:28:15 +08:00
• b7642d1e0f Merge branch 'feature/销售订单优化' into feature/采购消息通知 yuxianghui 2025-06-04 16:26:03 +08:00
• 05ffbdcc78 采购申请、待质检消息通知优化 yuxianghui 2025-06-04 16:24:52 +08:00
• 4b8d00ec1d Accept Merge Request #2159: (feature/6694 -> develop) 胡尧 2025-06-04 16:06:16 +08:00
• d2dbf4f986 修复质检字段显示错误问题 胡尧 2025-06-04 16:05:51 +08:00
• b0f2fe6a8e 未齐套提示 guanhuan 2025-06-04 13:38:40 +08:00
• edfd59468f Accept Merge Request #2158: (feature/销售订单优化 -> develop) 禹翔辉 2025-06-04 11:36:18 +08:00
• d7f04b61b5 Merge branch 'feature/消息通知优化' into feature/销售订单优化 yuxianghui 2025-06-04 11:33:04 +08:00
• 573b50da68 销售订单添加合同字段，销售订单form页面新增合同page页，优化/api/bfm_process_order/list接口添加合同信息处理。 yuxianghui 2025-06-04 11:31:28 +08:00
• 2e0dfc5b02 Accept Merge Request #2157: (feature/6694 -> develop) 胡尧 2025-06-04 09:17:01 +08:00
• 18cdc39719 修改没有状态码时默认为200 胡尧 2025-06-04 09:16:28 +08:00
• de951b1b45 未齐套提示 guanhuan 2025-06-03 16:16:11 +08:00
• b8cebe07fe 未齐套提示 guanhuan 2025-05-30 15:06:41 +08:00
• 14fa88da01 Accept Merge Request #2156: (feature/6694 -> develop) 胡尧 2025-05-30 10:27:10 +08:00
• 162814411f 修改编程返回记录申请人不对的问题 胡尧 2025-05-30 10:26:34 +08:00
• 1bdb81f5f7 待下达生产状态修改 guanhuan 2025-05-29 17:05:19 +08:00
• 49e4c88d83 Accept Merge Request #2155: (feature/6694 -> develop) 胡尧 2025-05-29 16:00:16 +08:00
• db81114a07 解决下发编程单报错的问题 胡尧 2025-05-29 15:59:48 +08:00
• e019383187 Accept Merge Request #2154: (feature/消息通知优化 -> develop) 禹翔辉 2025-05-29 14:19:17 +08:00
• 4a09148b53 质检消息通知优化 yuxianghui 2025-05-29 14:10:36 +08:00
• 007f39f137 程序工时修改 guanhuan 2025-05-29 11:07:46 +08:00
• ab139daf02 Accept Merge Request #2153: (feature/6694 -> develop) 胡尧 2025-05-29 10:18:49 +08:00
• 24d83b70d2 出厂检验报告需求 胡尧 2025-05-29 10:18:18 +08:00
• 307510e1ab Accept Merge Request #2152: (feature/消息通知优化 -> develop) 禹翔辉 2025-05-28 16:03:52 +08:00
• 9b7222961c Merge branch 'feature/采购申请消息通知' into feature/消息通知优化 yuxianghui 2025-05-28 15:58:06 +08:00
• 3304398c4c 1、重写待质检提醒消息通知；2、优化采购申请已批准消息通知 yuxianghui 2025-05-28 15:56:42 +08:00
• 074e59cee4 Accept Merge Request #2151: (feature/6694 -> develop) 胡尧 2025-05-28 14:08:43 +08:00
• 7ab8ab47ac 修改编程下发，修改编程记录 胡尧 2025-05-28 14:08:10 +08:00
• 9b01254b3c 下达生产 guanhuan 2025-05-28 10:47:03 +08:00
• 3a89ebff60 Accept Merge Request #2150: (feature/采购申请消息通知 -> develop) 禹翔辉 2025-05-28 09:58:22 +08:00
• d0ee2a6564 添加采购申请状态为待批准时的消息通知 yuxianghui 2025-05-28 09:54:27 +08:00
• 257d4a3b0a Accept Merge Request #2149: (feature/前端样式修改 -> develop) 黄焱 2025-05-27 09:13:57 +08:00
• 53a67d7c76 下达生产 guanhuan 2025-05-26 15:27:07 +08:00
• 40fe1f15a2 Accept Merge Request #2148: (feature/6694 -> develop) 胡尧 2025-05-26 09:32:06 +08:00
• 30a6e5bf2e 制造订单的编程记录修改 胡尧 2025-05-26 09:31:47 +08:00
• f4babfcd24 下达生产 guanhuan 2025-05-23 17:26:21 +08:00
• 794ea0cbb0 Accept Merge Request #2147: (feature/返工解绑rfid -> develop) 禹翔辉 2025-05-23 17:17:06 +08:00
• 619285608d 1、优化返工装夹预调工单时，清理rfid问题；2、优化库位信息接口数据处理方式 yuxianghui 2025-05-23 17:13:12 +08:00
• 433d5d63b7 Accept Merge Request #2146: (feature/搜索优化 -> develop) 管欢 2025-05-23 15:19:30 +08:00
• 38109028d4 采购申请关闭修改 guanhuan 2025-05-23 15:13:01 +08:00
• cf16a9dd59 采购申请关闭修改 guanhuan 2025-05-23 14:53:34 +08:00
• 4fcbeb30cf Accept Merge Request #2143: (feature/6694 -> develop) 胡尧 2025-05-23 14:47:58 +08:00
• be8fbca9aa 解决冲突 胡尧 2025-05-23 14:47:43 +08:00
• b393951968 去掉采购申请列表默认筛选条件 胡尧 2025-05-23 14:45:57 +08:00
• 6add565a98 Accept Merge Request #2144: (feature/搜索优化 -> develop) 管欢 2025-05-23 14:22:18 +08:00
• 1b0dd96b40 采购申请关闭修改 guanhuan 2025-05-23 14:20:48 +08:00
• 89f8718fe1 当询价单确认为采购单时，根据采购申请明细行变为采购单数量来完成采购申请 胡尧 2025-05-23 14:20:38 +08:00
• a5243970d5 需求计划 guanhuan 2025-05-23 14:14:50 +08:00
• 7941c1981c 撤回采购申请视图修改 胡尧 2025-05-23 11:37:21 +08:00
• f31e25b3b1 调整采购单菜单顺序 胡尧 2025-05-23 11:20:17 +08:00
• ae7e49e307 Accept Merge Request #2142: (feature/6694 -> develop) 胡尧 2025-05-23 11:11:10 +08:00
• 51c8287bbc 增加分组 胡尧 2025-05-23 11:10:46 +08:00
• 942d6661f2 修改api接口内容 胡尧 2025-05-23 10:51:39 +08:00
• 51ae598aac Accept Merge Request #2141: (feature/6694 -> develop) 胡尧 2025-05-23 09:43:07 +08:00
• 83229c9ab1 解决冲突 胡尧 2025-05-23 09:42:52 +08:00
• e62f933ca4 Accept Merge Request #2140: (feature/搜索优化 -> develop) 管欢 2025-05-23 09:41:03 +08:00
• 1f8e118965 取消采购单时，如果该采购单关联的库存移动是由采购申请创建的，则不取消 胡尧 2025-05-23 09:39:38 +08:00
• e46e6dfc2a 需求计划 guanhuan 2025-05-22 17:40:56 +08:00
• 2c52372b0a 采购申请隐藏处理中按钮 guanhuan 2025-05-22 11:44:14 +08:00
• 50f8bf5ab1 需求计划 guanhuan 2025-05-22 11:37:41 +08:00
• 5cf3d399f4 Accept Merge Request #2139: (feature/销售订单链接优化 -> develop) 禹翔辉 2025-05-22 11:37:13 +08:00
• e9fc78186e 处理 sf-销售-委外的按钮关联订单数据显示不全 问题 yuxianghui 2025-05-22 11:35:53 +08:00
• a2b2faaa95 Accept Merge Request #2138: (feature/6694 -> develop) 胡尧 2025-05-22 11:10:28 +08:00
• 4c7208784f Accept Merge Request #2137: (feature/中控接口优化 -> develop) 禹翔辉 2025-05-22 11:10:12 +08:00
• 981569170c Merge branch 'feature/销售委外加工按钮优化_1' into feature/中控接口优化 yuxianghui 2025-05-22 11:04:48 +08:00
• 6bf666ac18 修改欠单逻辑 胡尧 2025-05-22 11:04:12 +08:00
• 3a9cd3f39d 1、获取日计划接口优化；2、货位信息接口优化； yuxianghui 2025-05-22 11:04:06 +08:00
• 45b62abcbe Accept Merge Request #2136: (feature/6694 -> develop) 胡尧 2025-05-20 16:51:09 +08:00
• 87740dbee3 增加采购申请审批排除字段 胡尧 2025-05-20 16:49:08 +08:00
• a323acf7fc Accept Merge Request #2135: (feature/6694 -> develop) 胡尧 2025-05-20 16:09:06 +08:00
• c23715a1ef 取消采购申请部分确认生成的反向单据 胡尧 2025-05-20 16:08:03 +08:00
• 896c1ad3a7 更新库位信息接口，优化获取到数据后的数据处理逻辑。 yuxianghui 2025-05-20 13:46:43 +08:00
• 1856a1a4ef Accept Merge Request #2134: (feature/搜索优化 -> develop) 管欢 2025-05-19 11:04:44 +08:00
• 8bd09cddf0 采购申请按钮优化 guanhuan 2025-05-19 11:02:43 +08:00
• 52579673de 采购申请单完成操作优化 guanhuan 2025-05-19 08:54:02 +08:00
• 31cd131993 Accept Merge Request #2133: (feature/6694 -> develop) 胡尧 2025-05-16 11:50:47 +08:00
• 9f94a4e06f 在调拨单确认生成欠单时，修改对应采购申请明细行的目标移动 胡尧 2025-05-16 11:44:06 +08:00
• e66c6b1e1b Accept Merge Request #2132: (feature/销售委外加工按钮优化_1 -> develop) 禹翔辉 2025-05-16 09:21:46 +08:00
• e97d0af941 1 yuxianghui 2025-05-16 09:18:25 +08:00
• 65122d38d5 处理 销售-外购，委外的按钮关联订单数据显示不全 bug yuxianghui 2025-05-16 09:17:13 +08:00
• b626cbe217 Accept Merge Request #2131: (feature/6694 -> develop) 胡尧 2025-05-16 09:15:46 +08:00
• 4b443e65f6 解决库存单据零件图号零件名称不对的问题 胡尧 2025-05-16 09:14:37 +08:00
• 14700d6bf0 Accept Merge Request #2130: (feature/6694 -> develop) 胡尧 2025-05-15 16:49:05 +08:00
• a3c0fd3ccf 解决工艺外协采购单不显示的问题 胡尧 2025-05-15 16:48:34 +08:00
• a29265f17d 修改正则匹配成品名字序号 胡尧 2025-05-15 16:39:57 +08:00
• 0821ed021a Accept Merge Request #2129: (feature/6694 -> develop) 胡尧 2025-05-15 16:30:28 +08:00
• ac4883db66 解决采购申请中零件图号不匹配的问题 胡尧 2025-05-15 16:29:33 +08:00
• 5706aa0052 Accept Merge Request #2127: (feature/6694 -> develop) 胡尧 2025-05-15 16:12:18 +08:00
• f780e4f7ce 增加零件图号 胡尧 2025-05-15 16:11:31 +08:00