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

修复工件上下产线

修复编程单下发接口

952c24eb26 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-29 16:42:37 +08:00
fbfd932561 Accept Merge Request #987: (feature/拆解单优化 -> develop) 禹翔辉 2024-04-29 16:04:38 +08:00
cc590134f5 1 yuxianghui 2024-04-29 16:00:27 +08:00
338d620d5b 解决采购入库到具体库位的数量显示不对问题 yuxianghui 2024-04-29 15:53:40 +08:00
58344b09d2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送 jinling.yang 2024-04-29 15:33:41 +08:00
3d76d5f0b9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-29 15:32:04 +08:00
b1d42b9421 优化工件配送和空料架 jinling.yang 2024-04-29 15:31:46 +08:00
cec066c082 Accept Merge Request #986: (feature/拆解单优化 -> develop) 禹翔辉 2024-04-29 14:24:06 +08:00
239be9f4ea Merge branch 'feature/功能刀具组装添加校验' into feature/拆解单优化 yuxianghui 2024-04-29 14:20:26 +08:00
537e890926 1、优化功能刀具拆解后，不同情况下生成的刀具物料的位移记录；添加拆解成功后拆解成功的刀具日志；添加当拆解原因是【更换为其他刀具】时，目标货位必填；2、货位看板添加按产品搜索功能 yuxianghui 2024-04-29 14:19:22 +08:00
9e10382dd7 Accept Merge Request #985: (feature/制造代码优化 -> develop) 马广威 2024-04-29 12:20:11 +08:00
3a22c817df 修复工单实际开始时间 mgw 2024-04-29 12:15:54 +08:00
782e266988 恢复工单按钮展示 mgw 2024-04-29 11:36:29 +08:00
f3f138e93c Accept Merge Request #984: (feature/功能刀具组装添加校验 -> develop) 禹翔辉 2024-04-29 10:39:15 +08:00
8c78a24f7e Merge branch 'feature/接口优化' into feature/功能刀具组装添加校验 yuxianghui 2024-04-29 10:36:35 +08:00
45220d75af 新增运送空料架 jinling.yang 2024-04-28 17:34:41 +08:00
9d9b454ba5 1、刀具物料刀柄、夹具物料托盘搜索模型的序列号对象字段的list列表添加Rfid字段；2、制造单搜索看板添加记数功能；3、刀具组装岗添加货位的读写权限；4、功能刀具组装单弹窗添加手动输入五种物料的货位编码时，对该货位进行多项校验； yuxianghui 2024-04-28 17:20:11 +08:00
bc2c0f7fb0 修复站点状态未变，及页面筛选框优化 jinling.yang 2024-04-28 15:17:41 +08:00
809f5a196e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-28 14:57:28 +08:00
281b041a31 Merge branch 'feature/修复工件配送时间' into develop jinling.yang 2024-04-28 11:45:17 +08:00
1fa45a36f1 Accept Merge Request #983: (feature/修复工件配送时间 -> develop) 杨金灵 2024-04-28 11:45:00 +08:00
24722f474c 修复配送时agv站点验证 jinling.yang 2024-04-28 11:43:11 +08:00
5eb946d936 优化agv需求 jinling.yang 2024-04-28 11:34:17 +08:00
b7f7f0cdff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送时间 jinling.yang 2024-04-26 18:04:49 +08:00
42178e3e1e 上下产线接口新增IsComplete判断 jinling.yang 2024-04-26 18:04:30 +08:00
2ebd543d39 Accept Merge Request #982: (feature/制造代码优化 -> develop) 马广威 2024-04-26 15:55:44 +08:00
f452f0018f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-04-26 15:54:20 +08:00
cd3feb787f 增加日志打印 mgw 2024-04-26 15:53:26 +08:00
d0e7dbefc9 Accept Merge Request #981: (feature/修复工件配送时间 -> develop) 杨金灵 2024-04-26 15:36:30 +08:00
8f9781dd13 修复工件配送时间 jinling.yang 2024-04-26 14:44:26 +08:00
50aae8a1e8 Accept Merge Request #980: (feature/优化工件配送 -> develop) 杨金灵 2024-04-26 14:00:35 +08:00
41e551fe48 优化工件配送 jinling.yang 2024-04-26 13:57:47 +08:00
1293c327c6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-26 10:01:03 +08:00
74deef3d41 Merge branch 'feature/优化agv及工件配送' into develop jinling.yang 2024-04-26 10:00:47 +08:00
466dfa4889 Accept Merge Request #979: (feature/优化agv及工件配送 -> develop) 杨金灵 2024-04-26 10:00:30 +08:00
66dcc2f982 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv及工件配送 jinling.yang 2024-04-26 09:57:21 +08:00
9362a78f2a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-26 09:56:59 +08:00
9eb891dd0b 优化agv及工件配送 jinling.yang 2024-04-26 09:56:42 +08:00
84b82cac1d Accept Merge Request #978: (feature/接口优化 -> develop) 禹翔辉 2024-04-25 17:17:58 +08:00
761efbceaa Merge branch 'feature/中控接口注释及工厂数据处理' into feature/接口优化 yuxianghui 2024-04-25 17:16:11 +08:00
4bcd6b9944 1、优化机床刀位接口，数据写入到机床的刀位的方法；2、制造-刀具管理菜单下的机床换刀申请菜单隐藏，功能菜单改为作业单；3、刀柄和托盘采购入库时，对录入的Rfid做唯一性校验； yuxianghui 2024-04-25 17:14:30 +08:00
da22015d35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-25 15:46:32 +08:00
eb2b37eb06 Merge branch 'feature/优化工件配送' into develop jinling.yang 2024-04-25 15:46:18 +08:00
cd6a4b0a38 Accept Merge Request #977: (feature/优化工件配送 -> develop) 杨金灵 2024-04-25 15:45:22 +08:00
8bbb18b6f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件配送 jinling.yang 2024-04-25 15:43:30 +08:00
11864feaa4 优化工件配送 jinling.yang 2024-04-25 15:43:02 +08:00
735f602f2d Accept Merge Request #976: (feature/中控接口注释及工厂数据处理 -> develop) 禹翔辉 2024-04-25 14:14:12 +08:00
53ed0d76a6 Merge branch 'feature/中控对接接口优化' into feature/中控接口注释及工厂数据处理 yuxianghui 2024-04-25 14:10:22 +08:00
9d96e0681c 1、注释MES装刀指令接口，删除所以该接口的调用；注释质量检测失败时对零件特采接口的调用；2、序列号模型from界面临时添加按钮，解决工厂录入的有些刀柄序列号存在位数少于10的问题（通过SQL在左侧补零）（已隐藏）； yuxianghui 2024-04-25 14:02:51 +08:00
961f7bfdc5 Accept Merge Request #975: (feature/制造代码优化 -> develop) 马广威 2024-04-25 12:27:45 +08:00
9374bab0ce Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-04-25 12:26:52 +08:00
780944047f 中控接口增加权限认证 mgw 2024-04-25 12:26:31 +08:00
edd1f9a1ee Accept Merge Request #974: (feature/制造代码优化 -> develop) 马广威 2024-04-25 09:36:40 +08:00
be18124186 优化制造订单号界面展示效果 mgw 2024-04-25 09:36:05 +08:00
a400beb0a4 Accept Merge Request #973: (feature/制造代码优化 -> develop) 马广威 2024-04-25 09:03:56 +08:00
f4433ac3cc 增加工单处的尺寸赋值 mgw 2024-04-25 09:03:17 +08:00
b237e353a9 Accept Merge Request #972: (feature/制造代码优化 -> develop) 马广威 2024-04-24 22:55:52 +08:00
0bcd077914 优化制造订单状态问题 mgw 2024-04-24 22:53:48 +08:00
212f2df830 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-04-24 22:53:11 +08:00
192aecb17d Accept Merge Request #971: (feature/制造代码优化 -> develop) 马广威 2024-04-24 22:14:59 +08:00
6f2043e7e7 1、工单tree视图、from视图添加人工编程字段，及人工编程筛选项；2、序列号模型添加根据Rfid搜索的选项；3、修改零件特采接口，优化MES装刀申请接口、优化机床刀库接口； yuxianghui 2024-04-24 18:33:15 +08:00
0473e79fcf 优化获取线边刀架、料架信息接口 mgw 2024-04-24 17:27:39 +08:00
6ecc69590b Accept Merge Request #970: (feature/制造代码优化 -> develop) 马广威 2024-04-24 14:35:01 +08:00
f570eb9b50 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-04-24 14:24:59 +08:00
d4aa71975e Accept Merge Request #969: (feature/优化工件配送 -> develop) 马广威 2024-04-24 14:24:36 +08:00
3e7bef095c 整理代码 mgw 2024-04-24 14:23:37 +08:00
673a1c6448 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件配送 jinling.yang 2024-04-24 14:20:42 +08:00
231536089d 工件装夹岗扫描托盘RFID，识别校验并带出【同运工件】名称，并自动校验【目的生产线】一致【同运工件】校验目的生产线不一致，则弹窗提示：工件生产线不一致，请重新确认； jinling.yang 2024-04-24 14:20:26 +08:00
347e7f3efe 增加自动备份模块 mgw 2024-04-24 13:58:24 +08:00
31e3f53873 制造订单状态优化 mgw 2024-04-24 13:48:56 +08:00
b6334caf97 优化同步库区功能(线边刀、线边料) mgw 2024-04-24 11:26:52 +08:00
a83b8bcd14 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-04-24 08:58:54 +08:00
59c8631c15 库位变更接口优化 mgw 2024-04-24 08:58:15 +08:00
24d8c2426c Accept Merge Request #968: (feature/中控对接接口优化 -> develop) 禹翔辉 2024-04-23 19:56:57 +08:00
9778245ee7 1 yuxianghui 2024-04-23 19:56:10 +08:00
228770cb76 Merge branch 'feature/新增功能刀具拆解单模型' into feature/中控对接接口优化 yuxianghui 2024-04-23 19:52:20 +08:00
b80ba02c8f 1、俩个刀具组接口加上token验证；2、新增功能刀具组装完成时，如果单据来源于CAM用刀，则调用MES装刀指令接口； yuxianghui 2024-04-23 19:50:33 +08:00
1344bd7219 Accept Merge Request #967: (feature/优化工件配送添加编码字段 -> develop) 杨金灵 2024-04-23 19:21:38 +08:00
90d1f96857 优化工件配送添加编码字段 jinling.yang 2024-04-23 17:20:32 +08:00
ca01b055b8 修复：计划排程时计划开始时间选择明天-执行排程后时间变成今天了问题 mgw 2024-04-23 16:03:03 +08:00
1d54066664 Accept Merge Request #966: (feature/前端样式修改 -> develop) 黄焱 2024-04-23 15:42:49 +08:00
5488846c85 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改黄焱 2024-04-23 15:39:15 +08:00
d2f59f6c6a 设置【已完成】【报废】等状态的水印黄焱 2024-04-23 15:38:32 +08:00
c1addd823e Accept Merge Request #965: (feature/新增功能刀具拆解单模型 -> develop) 禹翔辉 2024-04-23 15:37:07 +08:00
c56886aebe 1、接口优化 yuxianghui 2024-04-23 15:33:59 +08:00
1979b33c32 Accept Merge Request #964: (feature/新增功能刀具拆解单模型 -> develop) 禹翔辉 2024-04-23 14:21:50 +08:00
1fa5ebd80a 1 yuxianghui 2024-04-23 14:19:55 +08:00
f1dad7701f Merge branch 'feature/库存模块优化' into feature/新增功能刀具拆解单模型 yuxianghui 2024-04-23 14:18:34 +08:00
8bc23f5136 1、优化功能刀具拆解单拆解原因为更换其他刀具时的扫码录入刀具物料货位信息功能；2、优化功能刀具拆解单确认拆解后的刀具物料拆解流程，及其刀具物料功能刀具的数量统计等；3、功能刀具拆解、功能刀具模块添加动作过滤已拆解状态的记录，并添加筛选方法；4、功能刀具组装流程添加刀具物料货位数量校验； yuxianghui 2024-04-23 14:15:45 +08:00
bcff104013 Accept Merge Request #963: (feature/优化agv -> develop) 杨金灵 2024-04-23 14:09:10 +08:00
307e052740 优化agv及站点位置和对应接口 jinling.yang 2024-04-23 14:05:10 +08:00
f236b149d8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-04-23 10:56:57 +08:00
9cfc084c5c 装夹预调工单，要带图纸和模型文件及坯料长宽高参数的优化需求2：状态变化逻辑 mgw 2024-04-23 10:54:04 +08:00
0630285483 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug feature/修改机床参数bug qihao.gong@jikimo.com 2024-04-23 10:11:38 +08:00
da48e0aea2 Accept Merge Request #962: (feature/工单页面修复 -> develop) 杨金灵 2024-04-23 09:58:01 +08:00
4e94b8b4c8 工单页面修复 jinling.yang 2024-04-23 09:54:44 +08:00
6af611b7c9 Accept Merge Request #961: (feature/优化工件配送及AGV -> develop) 杨金灵 2024-04-23 09:28:29 +08:00
9a157125ba 优化agv相关页面及对应接口 feature/优化工件配送及AGV jinling.yang 2024-04-22 22:30:05 +08:00
49e4f92a91 装夹预调工单，要带图纸和模型文件及坯料长宽高参数的优化需求 mgw 2024-04-22 20:03:16 +08:00
080a3d7175 1、优化扫码的托盘已绑定工单的提示信息；2、优化采购订单未审核时，金额数据不能改变的bug；3、功能刀具拆解单新增根据不同情况扫库位码录入五种物料的目的库位的信息；4、功能刀具拆解单新增拆解后的Rfid字段，新增拆解单状态字段，新增刀具物料库位信息搜索过滤；5、功能刀具拆解单新增确认拆解按钮，完成点击确认拆解后的刀具物料是否报废、磨削或者更换的不同条件进行拆解后物料的不同去向的功能及生成移动历史，解除功能刀具Rfid的绑定并更改状态等。6、优化功能刀具管理下的菜单目录布局；7、 yuxianghui 2024-04-22 17:59:48 +08:00