jinling.yang
|
0f7f67aade
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
|
2023-06-29 17:14:48 +08:00 |
|
jinling.yang
|
aea68f5239
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
# Conflicts:
# sf_base/__manifest__.py
# sf_base/models/__init__.py
# sf_mrs_connect/data/ir_cron_data.xml
# sf_mrs_connect/models/sync_common.py
|
2023-06-27 16:40:58 +08:00 |
|
jinling.yang
|
d18b1808d9
|
新增同步夹具相关的定时器
|
2023-06-27 16:35:30 +08:00 |
|
马广威
|
8b94696dc3
|
Accept Merge Request #205: (feature/sf刀具基础信息管理 -> develop)
Merge Request: sf刀具重构完成，同步方法测试完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/205?initial=true
|
2023-06-27 16:27:32 +08:00 |
|
jinling.yang
|
87e3f6d04e
|
新增夹具和功能夹具，及同步mrs的夹具和功能夹具
|
2023-06-26 18:07:44 +08:00 |
|
mgw
|
65c8d4a4e9
|
sf刀具重构完成，同步方法测试完成
|
2023-06-25 16:44:10 +08:00 |
|
qihao.gong@jikimo.com
|
23aba08c87
|
处理bug
|
2023-06-16 10:56:25 +08:00 |
|
qihao.gong@jikimo.com
|
018fecfc59
|
处理冲突
|
2023-06-16 10:02:33 +08:00 |
|
yuxianghui
|
3a8c65c8d1
|
解决sf代码冲突问题
|
2023-06-13 11:19:06 +08:00 |
|
mgw
|
a1678f76c2
|
同步方法基本完成，优化图片展示
|
2023-06-12 13:17:52 +08:00 |
|
mgw
|
bf3c7e2b4d
|
sf刀具基础信息已初步建立
|
2023-06-08 14:58:40 +08:00 |
|
jinling.yang
|
bf010e2cca
|
去掉警告及开发表面工艺相关需求
|
2023-03-27 21:04:33 +08:00 |
|
jinling.yang
|
a18d55850a
|
优化文件内容
|
2022-12-01 17:18:49 +08:00 |
|
jinling.yang
|
e12d3acf4d
|
修改模块分类名称
|
2022-11-22 09:56:29 +08:00 |
|
jinling.yang
|
830f3bb35e
|
212
|
2022-11-21 20:04:56 +08:00 |
|
jinling.yang
|
c4876e9631
|
Merge branch 'feature/修改产品等信息' into develop
# Conflicts:
# sf_base/models/product_template.py
# sf_route_workcenter/models/workcenter.py
|
2022-11-20 20:11:21 +08:00 |
|
gqh
|
057ec915d9
|
更新制造订单生成工单时的工序字段
|
2022-11-17 17:27:05 +08:00 |
|
jinling.yang
|
98c3f868e9
|
123
|
2022-11-16 09:42:33 +08:00 |
|
gqh
|
dc24df19c2
|
修改
|
2022-11-08 10:39:45 +08:00 |
|
gqh
|
dcbf38c039
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单流程
# Conflicts:
# sf_base/__manifest__.py
# sf_bpm_api/__manifest__.py
# sf_manufacturing_orders/models/sf_production.py
|
2022-11-08 10:30:00 +08:00 |
|
jinling.yang
|
c0d8fe0f6f
|
新增模块引用
|
2022-11-08 10:02:41 +08:00 |
|
jinling.yang
|
c1d6a24cd9
|
去掉非相关代码
|
2022-11-08 10:01:53 +08:00 |
|
gqh
|
7118596e1c
|
工单流程代码合并
|
2022-11-07 16:42:49 +08:00 |
|
gqh
|
a49a24e9e6
|
合并代码
|
2022-11-07 10:59:22 +08:00 |
|
jinling.yang
|
ae85009a18
|
修复模板类型工序
|
2022-11-01 17:30:25 +08:00 |
|
jinling.yang
|
002653957e
|
改造制造订单里的生成工单
|
2022-10-27 17:27:40 +08:00 |
|
jinling.yang
|
71a925334e
|
生成产品的BOM上的加工工序
|
2022-10-26 17:27:32 +08:00 |
|
jinling.yang
|
5b75e5423a
|
生成bom
|
2022-10-18 18:36:41 +08:00 |
|
jinling.yang
|
c06fec0e74
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
# sf_base/views/menu_view.xml
# sf_base/views/mrs_common_view.xml
|
2022-10-14 16:41:22 +08:00 |
|
jinling.yang
|
b4aa6b61ed
|
智能工厂去掉工厂token等信息
|
2022-10-14 16:36:45 +08:00 |
|
gqh
|
5e5d62eabd
|
制造订单 单个制造
|
2022-10-14 14:44:05 +08:00 |
|
jinling.yang
|
8611e138b3
|
新增工厂临时token密钥字段
|
2022-10-13 17:25:25 +08:00 |
|
gqh
|
7e98d35f14
|
更新sf
|
2022-10-13 16:43:36 +08:00 |
|
jinling.yang
|
d24ade9e55
|
智能工厂API接口创建销售订单
|
2022-10-11 21:54:44 +08:00 |
|
jinling.yang
|
e86a82c4b9
|
智能工厂接口新增相关字段
|
2022-10-10 23:13:35 +08:00 |
|
gqh
|
2e6b2489ee
|
一键同步 代码优化 常量共享
|
2022-10-08 09:41:57 +08:00 |
|
gqh
|
11b0675241
|
初次提交，智能工厂基础数据
|
2022-09-26 12:02:52 +08:00 |
|