jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,769 Commits 134 Branches 0 Tags
3e7f145255fd0210d0f27e1dd9abec67a73da915
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
禹翔辉 3e7f145255 Accept Merge Request #781: (feature/CAM用刀优化及添加接口 -> develop) 
Merge Request: 1、添加机床刀位字段

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/781?initial=true
2024-01-22 15:55:40 +08:00
.idea
修改.gitignore文件，注释忽略lib文件夹部分
2023-07-14 12:26:21 +08:00
code_backend_theme
0626提交
2023-06-26 17:35:55 +08:00
fixed_header_list
Merge branch 'develop' into feature/修改看板样式
2023-07-06 14:41:17 +08:00
jikimo_frontend
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-01-18 09:14:25 +08:00
mrp_mps
新增主生产计划模块
2023-08-15 10:36:04 +08:00
mrp_workorder
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2023-12-06 15:37:38 +08:00
password_security
维保计划视图优化
2023-07-14 17:27:11 +08:00
quality
新增质量团队和控制点的审核按钮
2023-12-07 10:50:36 +08:00
quality_control
新增质量团队和控制点的审核按钮
2023-12-07 10:50:36 +08:00
sf_base
Accept Merge Request #779: (feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口 -> develop)
2024-01-22 15:41:49 +08:00
sf_bf_connect
http验证代码还原
2024-01-22 15:41:20 +08:00
sf_dlm
1.修复产品类别和计量单位去掉审核状态字段2.优化bfm派单至sf的销售订单流程3.工序增加编码字段
2024-01-19 15:45:15 +08:00
sf_dlm_management
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购按钮显示及产品字段问题
2024-01-09 12:01:47 +08:00
sf_global_search
增加平板扫码功能
2023-04-24 16:00:08 +08:00
sf_machine_connect
1、工单的cnc加工模型添加功能刀具类型字段；2、添加根据刀具类型和刀具名称检索现有功能刀具是否满足需求，如果不满足则创建CAM工单程序用刀计划记录的功能记录；3、添加MES装刀指令接口，根据cnc加工所需的刀具类型和刀具名称检索现有机床内功能刀具是否满足需求，如果不满足则发送MES装刀指令；4、添加刀具组接口，新增功能刀具时传送功能刀具名称、编码、刀具组。
2024-01-18 17:33:54 +08:00
sf_maintenance
合并cnc加工和后置检测工单，新增工单开始结束接口
2024-01-17 17:26:24 +08:00
sf_manufacturing
1、添加机床刀位字段
2024-01-22 15:54:30 +08:00
sf_manufacturing_translation/translation_Po
sf优化绑定托盘，工单form显示开始按钮 加工时间
2023-02-01 17:53:32 +08:00
sf_mrs_connect
Merge remote-tracking branch 'origin/feature/功能刀具新增字段' into feature/夹具型号同步优化
2024-01-11 14:11:57 +08:00
sf_plan
增加刀具管理权限控制，刀具组权限控制，隐藏工单上原生按钮，修复只读权限后修改记录无权限问题等
2024-01-19 11:49:57 +08:00
sf_plan_management
修改标签翻译
2024-01-09 10:11:13 +08:00
sf_quality
1、新增机床刀具组接口，在刀具组新建和更新时调用接口；2、新增零件特采接口，在质量检测审核之后调用接口；
2024-01-19 17:26:45 +08:00
sf_sale
注释代码还原
2024-01-22 15:37:06 +08:00
sf_tool_management
Accept Merge Request #780: (feature/制造代码优化 -> develop)
2024-01-22 15:40:23 +08:00
sf_warehouse
Accept Merge Request #780: (feature/制造代码优化 -> develop)
2024-01-22 15:40:23 +08:00
sf_wxwork_approval
1.新增销售和计划权限组2.优化代码格式
2023-11-21 16:10:05 +08:00
spiffy_theme_backend
修改表格样式css的选择器
2023-07-19 14:49:42 +08:00
stock_barcode
no message
2023-08-03 17:32:43 +08:00
web_copy_confirm
解决冲突
2023-06-12 14:35:14 +08:00
web_enterprise
测试背景图片在线上展示
2023-09-26 14:54:13 +08:00
web_environment_ribbon
解决冲突
2023-06-12 14:35:14 +08:00
web_gantt
甘特图增加滚轮事件，点击事件
2023-12-06 15:39:07 +08:00
web_grid
合并企业版代码(未测试，先提交到测试分支)
2023-04-14 17:42:23 +08:00
web_map
合并企业版代码(未测试，先提交到测试分支)
2023-04-14 17:42:23 +08:00
web_mobile
合并企业版代码(未测试，先提交到测试分支)
2023-04-14 17:42:23 +08:00
web_refresher
解决冲突
2023-06-12 14:35:14 +08:00
web_sheet_full_width
解决冲突
2023-06-12 14:35:14 +08:00
web_widget_model_viewer
Accept Merge Request #697: (feature/制造代码优化 -> develop)
2023-11-27 21:33:35 +08:00
yizuo_login_background_and_styles
修改coding代码扫描警告
2023-11-27 17:08:11 +08:00
zpl_print
修改coding代码扫描警告
2023-11-27 17:08:11 +08:00
__init__.py
3d模型
2023-03-03 18:17:48 +08:00
.gitignore
修改.gitignore文件，注释忽略lib文件夹部分
2023-07-14 12:26:21 +08:00
Dockerfile
测试devops
2023-03-15 16:30:29 +08:00
odoo.conf
修复配置文件问题
2023-12-26 09:39:52 +08:00
README.md
Initial Commit
2022-09-09 16:12:13 +08:00
requirements.txt
新增cpca模块
2023-04-25 16:22:09 +08:00

README.md

#jikimo_sf

Description
No description provided
Readme 186 MiB