jikimo/test - test - Gitea: Git with a cup of tea

jikimo/test

Go to file

禹翔辉 7795cfef29 Accept Merge Request #215 : (feature/sf刀具功能分支 -> develop)

Merge Request: 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示，新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/215?initial=true

2023-06-29 15:55:58 +08:00

解决冲突

2023-06-12 14:35:14 +08:00

mrp_maintenance

设备维保

2023-06-25 17:37:55 +08:00

合并企业版模块

2023-04-21 11:24:52 +08:00

解决冲突

2023-06-12 14:35:14 +08:00

优化sf字段形式

2023-06-29 09:56:31 +08:00

刀具产品页面刀具物料及型号字段修改

2023-06-28 18:32:45 +08:00

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化

2023-06-29 11:15:40 +08:00

sf_global_search

增加平板扫码功能

2023-04-24 16:00:08 +08:00

sf_machine_connect

修复进度不更新到bfm的问题，在sf的设置处增加bfm环境选择（正式、测试、开发）

2023-05-23 10:41:10 +08:00

处理设备与设备维保标准的关联关系方法，新增设备故障报警日志页面

2023-06-27 17:32:24 +08:00

sf_manufacturing

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化

2023-06-29 11:15:40 +08:00

sf_manufacturing_translation/translation_Po

sf优化绑定托盘，工单form显示开始按钮加工时间

2023-02-01 17:53:32 +08:00

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化

2023-06-29 11:15:40 +08:00

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示

2023-05-15 17:02:01 +08:00

sf_tool_management

Accept Merge Request #215 : (feature/sf刀具功能分支 -> develop)

2023-06-29 15:55:58 +08:00

sf_wxwork_approval

Merge branch refs/heads/develop into refs/heads/feature/企业微信审批接入

2023-06-02 17:07:01 +08:00

web_copy_confirm

解决冲突

2023-06-12 14:35:14 +08:00

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00

web_environment_ribbon

解决冲突

2023-06-12 14:35:14 +08:00

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00

解决冲突

2023-06-12 14:35:14 +08:00

web_sheet_full_width

解决冲突

2023-06-12 14:35:14 +08:00

web_widget_model_viewer

产品新增3d模型展示

2023-03-06 17:02:21 +08:00

yizuo_login_background_and_styles

修复密码错误bug

2023-01-31 11:30:13 +08:00

一键打印功能

2023-02-28 17:32:24 +08:00

__init__.py

3d模型

2023-03-03 18:17:48 +08:00

.gitignore

Initial Commit

2022-09-09 16:12:13 +08:00

Dockerfile

测试devops

2023-03-15 16:30:29 +08:00

odoo.conf

出入库单新增验证及单个外协表面工艺Bug修复

2023-05-17 14:18:23 +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

Languages

Python 53%

JavaScript 30%

SCSS 8.1%

HTML 5.1%

CSS 1.9%

Other 1.9%