Commit Graph - test - Gitea: Git with a cup of tea

jikimo/test

Fork 0

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

修复工件上下产线

修复编程单下发接口

b526565ac4 Accept Merge Request #960: (feature/修复快递订单模型路径字段问题 -> develop) 杨金灵 2024-04-22 15:49:46 +08:00
690a66b6a1 修复快递订单模型路径字段问题 jinling.yang 2024-04-22 15:46:43 +08:00
c0db402f5e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-22 15:45:29 +08:00
d634cf20ba Merge branch 'feature/修复快速订单' into develop jinling.yang 2024-04-22 15:10:39 +08:00
220af93ed6 Accept Merge Request #959: (feature/修复快速订单 -> develop) 杨金灵 2024-04-22 15:07:17 +08:00
eb6607be00 修复获取cnc程序方法关于快速订单部分 jinling.yang 2024-04-22 14:27:59 +08:00
4b2e58a66d 修复快速订单订单号和人工报价及注释掉识别长宽高代码 jinling.yang 2024-04-22 14:14:59 +08:00
9c5b3d7c4e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-22 14:04:50 +08:00
9cb1b8c5aa Accept Merge Request #958: (feature/制造代码优化 -> develop) 马广威 2024-04-22 10:58:53 +08:00
e108e2d5d6 增加工单模型展示，工单物料增加长宽高值 mgw 2024-04-22 10:58:04 +08:00
90c87f7ddb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-22 09:28:51 +08:00
f0bfd18549 Merge branch 'feature/优化agv和ftp' into develop jinling.yang 2024-04-22 09:26:52 +08:00
c86fd099eb Accept Merge Request #957: (feature/优化agv和ftp -> develop) 杨金灵 2024-04-22 09:26:33 +08:00
857d5d8916 1、新增功能刀具拆解模型及其前端的tree、form视图，新增扫码录入需要拆解的功能刀具功能； yuxianghui 2024-04-19 20:12:32 +08:00
5cb1e3c838 修复快速订单 jinling.yang 2024-04-19 17:24:51 +08:00
45b300f8a1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv和ftp jinling.yang 2024-04-19 16:50:59 +08:00
a30c620823 优化快读订单 jinling.yang 2024-04-19 16:50:38 +08:00
263b8ddec7 Accept Merge Request #956: (feature/前端样式修改 -> develop) 黄焱 2024-04-19 15:45:17 +08:00
89eccb40ac 处理按钮显示 mgw 2024-04-19 15:42:35 +08:00
761d0b0417 修复列表总计合计与单项合计错开了一列黄焱 2024-04-19 15:41:05 +08:00
f22ee428b6 Accept Merge Request #955: (feature/库存模块优化 -> develop) 禹翔辉 2024-04-19 15:02:40 +08:00
1a860a5eb9 1、设备机床新增机床基坐标page页及其基本信息字段，新增主动获取和被动获取基坐标数据中控接口（接口待对接）； yuxianghui 2024-04-19 14:59:19 +08:00
96a4ee4e26 1 yuxianghui 2024-04-19 13:42:12 +08:00
80f0284c3c 1、优化货位看板的更换货位功能、添加按编码搜索功能； yuxianghui 2024-04-19 13:39:17 +08:00
bcba08042b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv和ftp jinling.yang 2024-04-19 11:28:50 +08:00
25ee2136c3 Accept Merge Request #954: (feature/库存模块优化 -> develop) 禹翔辉 2024-04-19 11:00:36 +08:00
50f5815070 Merge branch 'feature/内部调拨作业详情添加Rfid字段' into feature/库存模块优化 yuxianghui 2024-04-19 10:54:36 +08:00
b43c3496a1 1、货位看板模型添加货位变更弹窗模块及其功能按钮，实现产品在同库区的内部货位移动； yuxianghui 2024-04-19 10:49:48 +08:00
f1972ca572 Accept Merge Request #953: (feature/优化获取CNC程序 -> develop) 杨金灵 2024-04-19 09:10:46 +08:00
5f2600c96f 释放注释代码 jinling.yang 2024-04-19 08:34:41 +08:00
040b3b16f0 修复产品条码 jinling.yang 2024-04-19 08:33:04 +08:00
67f3c312de 1、添加采购入库作业详情选取目标货位重复校验 yuxianghui 2024-04-18 20:46:09 +08:00
f26b4510cf 1、采购入库作业详情的目标位置字段关闭创建功能，关闭货位的创建功能；2、优化入库到货位流程（进行中）； yuxianghui 2024-04-18 19:10:41 +08:00
053fa3feb3 优化ftp路径 jinling.yang 2024-04-18 19:09:48 +08:00
59670fb3d7 优化获取CNC程序：添加编程方式（人工/自动），如是快速订单，编程方式为人工 jinling.yang 2024-04-18 18:40:05 +08:00
8dfef16b51 1、产品模型、制造订单模型、工单模型，添加人工编程字段；2、放开工单扫描绑定Rfid的检验功能；3、bfm下单创建产品添加人工报价字段内容；4、优化CNC程序用刀检验库区是否有刀的流程； yuxianghui 2024-04-18 15:38:16 +08:00
3d1dd533b5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-17 17:11:39 +08:00
83d1d397f5 Merge branch 'feature/优化货架货位-新增打印条码' into develop jinling.yang 2024-04-17 17:09:37 +08:00
0a9cfd916a Accept Merge Request #949: (feature/优化货架货位-新增打印条码 -> develop) 杨金灵 2024-04-17 17:06:53 +08:00
2e5dd55a7b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化货架货位-新增打印条码 jinling.yang 2024-04-17 17:05:36 +08:00
4fb57373d5 Accept Merge Request #951: (feature/制造代码优化 -> develop) 马广威 2024-04-17 17:03:38 +08:00
8a85581347 Accept Merge Request #950: (feature/内部调拨作业详情添加Rfid字段 -> develop) 禹翔辉 2024-04-17 17:03:04 +08:00
22c388f52c 1、优化品牌同步接口，2、内部调拨作业详情添加Rfid字段； yuxianghui 2024-04-17 17:01:01 +08:00
0103024f1c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-04-17 16:52:08 +08:00
988241a1bd 条码添加图片展示控件 jinling.yang 2024-04-17 16:10:44 +08:00
92af278451 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化货架货位-新增打印条码 jinling.yang 2024-04-17 16:01:10 +08:00
19b062f5ac 新增货架一键打印所有货位条码和单个打印货位条码 jinling.yang 2024-04-17 16:00:47 +08:00
7897e6e55b Accept Merge Request #948: (feature/功能刀具组装流程优化完成 -> develop) 禹翔辉 2024-04-17 15:02:52 +08:00
259f12a11f Merge branch 'feature/功能刀具组装流程测试及优化' into feature/功能刀具组装流程优化完成 yuxianghui 2024-04-17 14:57:39 +08:00
c6b1c5e047 1、删除功能刀具列表模型的刀具名称计算方法，改为创建记录时给数据；2、功能刀具组装单弹窗添加根据旧刀具名称自动选择新刀具的名称；优化没有序列号的刀具物料的库存位移方法，并在刀具物料出库同时货位物料数减一；关闭弹窗创建刀具组、功能刀具名称记录功能； yuxianghui 2024-04-17 14:55:45 +08:00
38c89a4167 Accept Merge Request #947: (feature/优化快速订单 -> develop) 杨金灵 2024-04-17 14:21:49 +08:00
59683790b7 优化页面展示 jinling.yang 2024-04-17 14:19:38 +08:00
ceae788ecc 三次元检测z计算修改 mgw 2024-04-17 14:18:40 +08:00
f04cbac8d9 1.去掉上色和特征识别方法, 2.转换模型需自动识别模型长宽高 3.优化页面：下拉框关闭创建 4.权限修改为不可编辑 jinling.yang 2024-04-17 13:19:07 +08:00
36db60812e Merge branch 'feature/功能刀具组装优化' into feature/功能刀具组装流程测试及优化 yuxianghui 2024-04-16 17:23:55 +08:00
3c47553be6 1、添加销售总监和采购总监对夹具的可读权限；2、工单的tree视图添加制造订单字段 yuxianghui 2024-04-16 17:22:16 +08:00
c535808d5f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-16 16:22:50 +08:00
d8a876796a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv和ftp jinling.yang 2024-04-16 16:22:40 +08:00
d777970a9b 1.ftp文件路径修改为:/NC/以下 jinling.yang 2024-04-16 16:22:26 +08:00
d1e9254996 Accept Merge Request #946: (feature/制造代码优化 -> develop) 马广威 2024-04-15 21:15:28 +08:00
028eb18dd8 修改测点位置匹配，优化错误抛出方式 mgw 2024-04-15 21:14:12 +08:00
c4ddd067e7 Accept Merge Request #945: (feature/前端样式修改 -> develop) 黄焱 2024-04-15 17:22:01 +08:00
48cba4274b 修改因添加表格必填而出现报错问题黄焱 2024-04-15 17:04:43 +08:00
9df62129b7 控制按钮显隐逻辑 mgw 2024-04-15 13:39:58 +08:00
65330b083b Accept Merge Request #944: (feature/制造代码优化 -> develop) 马广威 2024-04-15 11:40:57 +08:00
543f1a8e9b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-04-15 11:39:35 +08:00
19156f5944 优化代码健壮性，解决部分硬编码问题 mgw 2024-04-15 11:39:10 +08:00
9ac3ef7c93 前置三次元检测数据读取 mgw 2024-04-15 11:16:33 +08:00
3f9eb762f9 Accept Merge Request #943: (feature/刀具定时同步到cloud -> develop) 禹翔辉 2024-04-15 10:25:15 +08:00
ef0e09ba4b 1、优化没有刀具信息记录时同步报错问题 yuxianghui 2024-04-15 10:22:19 +08:00
eb2db1dfdd 1、添加定时同步刀具物料和功能刀具相关的信息到cloud的功能；2、添加同步所以刀具物料和所以功能刀具相关记录同步接口； yuxianghui 2024-04-12 17:30:59 +08:00
180db6b91e 1、调整功能刀具清单模型的菜单代码位置，解决依赖冲突问题；2、产品采购时，添加一个订单同时采购多个相同产品的校验；3、优化刀柄采购入库时，自动生成的序列号规则； yuxianghui 2024-04-12 16:15:02 +08:00
482dbb9baa Merge branch 'feature/优化组装单模型' into feature/功能刀具组装优化 yuxianghui 2024-04-12 10:22:26 +08:00
4391a4e145 1、功能刀具清单模型添加功能刀具名称重名检验，2、功能刀具安全库存模型添加根据所选功能刀具名称自动带出类型、刀具组、直径、R角信息；3、优化刀具物料搜索模型，物料数量字段改为存储字段，根据对应产品的各个位置的库存数量自动计算刀具物料的总数等值； yuxianghui 2024-04-11 17:34:15 +08:00
010fbb23b0 1、优化工单扫描绑定托盘的验证条件，只有在工单已完成时不能再扫描绑定托盘；2、优化中控的刀具组接口，改为传输功能刀具清单的刀具组数据；3、优化功能刀具组装单模型的刀柄信息，删除刀柄货位字段，添加刀柄Rfid字段，根据货位带出刀柄信息改为根据序列号带出；5、优化功能刀具组装单弹窗，删除刀柄货位字段添加刀柄Rfid字段，删除刀柄的扫货位录入信息的代码；夹头货位改为非必填；添加组装后刀具组字段，添加根据所选的功能刀具名称，自动带出功能刀具的类型、刀具组、直径、刀尖R角、最大寿命值、总长度、伸出长、避空长信息，且可修改；6、优化调整功能刀具组装单弹窗的布局； yuxianghui 2024-04-11 15:11:50 +08:00
7f6444cc89 1、优化功能刀具组装模型，重构刀具物料的组成结构；2、优化刀具物料查询模型，重构刀具物流库存统计方法；3、优化功能刀具组装流程，重构刀具物料出库方法；4、重构扫码录入刀具物料数据方法；5、优化功能刀具列表模型； yuxianghui 2024-04-10 17:32:35 +08:00
b5767970a4 Accept Merge Request #942: (feature/制造代码优化 -> develop) 马广威 2024-04-09 20:43:57 +08:00
422e4bda6c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-04-09 20:42:15 +08:00
29790b7760 Accept Merge Request #941: (feature/优化组装单模型 -> develop) 马广威 2024-04-09 20:16:09 +08:00
310a2de34f 开完库存处新增需求基本完成 mgw 2024-04-09 20:14:44 +08:00
12a54d1f2a Merge branch 'feature/新增功能刀具清单' into feature/优化组装单模型 yuxianghui 2024-04-09 17:29:13 +08:00
f19a1a282a 1、优化扫描录入刀具物料方法， yuxianghui 2024-04-09 17:27:37 +08:00
cc7a72d6f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-09 17:25:16 +08:00
1681e9e4da Merge branch 'feature/修复刀具物料同步' into develop jinling.yang 2024-04-09 17:24:55 +08:00
cf3514e407 Accept Merge Request #940: (feature/修复刀具物料同步 -> develop) 杨金灵 2024-04-09 17:24:36 +08:00
abdb636176 1.补充agv优化代码 2.修复刀具物料同步 jinling.yang 2024-04-09 17:10:53 +08:00
85649daef6 1、功能刀具清单模型添加功能刀具类型、加工材料、寿命字段；2、删除供应商的地址和email必填；3、优化功能刀具组装单模型，新增五种物料的货位字段，修改继承关系，添加根据货位获取刀具物料信息功能； yuxianghui 2024-04-09 16:53:15 +08:00
8eee9d9173 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new jinling.yang 2024-04-09 16:47:56 +08:00
c104ecf24b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-09 16:47:12 +08:00
961b4f8e2d 库存需求修改1 mgw 2024-04-09 15:21:47 +08:00
0a4c86f601 功能刀具清单添加刀具组字段 yuxianghui 2024-04-09 13:38:13 +08:00
9e5843c4a8 Accept Merge Request #938: (feature/新增功能刀具清单 -> develop) 禹翔辉 2024-04-09 11:18:47 +08:00
e9bca64f20 Merge branch 'feature/工单扫描绑定Rfid优化' into feature/新增功能刀具清单 yuxianghui 2024-04-09 10:48:57 +08:00
34ea140941 1、新增功能刀具清单模型，及其tree视图、权限；2、功能刀具安全库存模型和功能刀具组装单模型新增功能刀具名称关联功能刀具清单，优化功能刀具组装流程生成功能刀具安全库存信息的流程 yuxianghui 2024-04-09 10:46:08 +08:00
0dc94fa69b Accept Merge Request #937: (feature/前端样式修改 -> develop) 黄焱 2024-04-08 17:19:01 +08:00
4c9fbab471 修改制造模块子页面样式问题黄焱 2024-04-08 17:17:27 +08:00
51685ba68b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-08 16:51:54 +08:00
04de8fe9de Merge branch 'feature/优化Rfid绑定工单' into develop jinling.yang 2024-04-08 16:51:32 +08:00
bb29db2ff5 Accept Merge Request #936: (feature/优化Rfid绑定工单 -> develop) 杨金灵 2024-04-08 16:51:13 +08:00
3f86dd48ec Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化Rfid绑定工单 jinling.yang 2024-04-08 16:47:16 +08:00