jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,673 Commits 134 Branches 31 Tags
a19cf5d894f9e76237c156f5a824fd08b584cd0b
Commit Graph

6673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jinling.yang
0b0f5c82ed Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_dlm/data/product_data.xml
 2022-12-12 16:56:04 +08:00
jinling.yang
70b7aa4c0f 工单修改 2022-12-12 16:52:58 +08:00
gqh
257ed593c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_dlm/data/product_data.xml
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_mrs_connect/controllers/controllers.py
 2022-12-12 14:52:48 +08:00
gqh
e0a0b3d411 优化odoo16工单视图展示问题 2022-12-12 14:46:54 +08:00
杨金灵
aa25e5b931 Accept Merge Request #46: (feature/修改胚料部分 -> develop) 
Merge Request: 修改胚料部分

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/46
 2022-12-12 10:11:28 +08:00
jinling.yang
331f230974 stock.production.lot对象修改为stock.lot，http新增验证返回 2022-12-12 10:04:16 +08:00
jinling.yang
5e2d75b23e 修改胚料部分 2022-12-09 17:23:07 +08:00
jinling.yang
a18d55850a 优化文件内容 2022-12-01 17:18:49 +08:00
jinling.yang
096cd44b9c Merge branch 'feature/从ftp获取cnc程序文件' into develop 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2022-11-30 17:27:47 +08:00
jinling.yang
1bf8e8a268 文件写入cnc关联的attach里面 2022-11-30 17:19:46 +08:00
gqh
d1d748cf11 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2022-11-30 14:43:37 +08:00
gqh
4fa8bb964d 合并 2022-11-30 14:42:52 +08:00
mgw
b2d1e9ce8c ①增加扫码绑定函数；②工单处扫码绑定托盘代码移植到mrp.workorder下；③修改报错格式为Usererror;④、返回偏差计算值 2022-11-30 14:38:58 +08:00
jinling.yang
8fce929022 从ftp获取cnc程序文件 2022-11-30 11:25:37 +08:00
jinling.yang
d6321bcb26 cnc对象修改 2022-11-28 12:21:39 +08:00
jinling.yang
b9212eec90 工单新增引用 2022-11-25 10:59:53 +08:00
jinling.yang
6365eed869 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2022-11-25 10:57:03 +08:00
jinling.yang
b498637154 修改cnc编程单 2022-11-25 10:56:37 +08:00
gqh
51ff0dc6ac 行业编码注册获取到sf 2022-11-23 14:11:59 +08:00
gqh
dde822359a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2022-11-23 11:01:05 +08:00
gqh
1582896ac4 机床唯一编码生成 2022-11-23 11:00:07 +08:00
jinling.yang
11a360222e cnc获取 2022-11-22 21:18:15 +08:00
jinling.yang
cc739a218e 新增引用 2022-11-22 14:17:27 +08:00
jinling.yang
bfee3e7775 新增引用 2022-11-22 13:52:37 +08:00
jinling.yang
6b9fe9167e 代码终版 2022-11-22 13:18:18 +08:00
jinling.yang
12615b3dba 销售和产品代码整合 2022-11-22 11:08:07 +08:00
jinling.yang
3cbd1140bb mrs为名的更改为sf 2022-11-22 10:20:18 +08:00
jinling.yang
bf5f8fd326 托盘更改模块名 2022-11-22 10:00:51 +08:00
jinling.yang
e12d3acf4d 修改模块分类名称 2022-11-22 09:56:29 +08:00
jinling.yang
c3fdaf8d76 更改制造模块名 2022-11-22 09:41:52 +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
jinling.yang
aeb9b0f796 新增获得mrs下发编程单 2022-11-20 19:44:31 +08:00
gqh
cbf8366cc3 工单开始需要完成上一步 2022-11-20 19:05:00 +08:00
jinling.yang
a0b7b13c5e 优化获得cnc程序代码 2022-11-19 22:52:47 +08:00
jinling.yang
dadd2e03da 获得cnc代码 2022-11-18 18:08:53 +08:00
gqh
057ec915d9 更新制造订单生成工单时的工序字段 2022-11-17 17:27:05 +08:00
jinling.yang
191bd65d69 接收从智能工厂传过来的订单等数据并创建编程单 2022-11-16 17:39:42 +08:00
gqh
4f0df9f2bd 制造订单工序自动生成规则 2022-11-16 17:35:42 +08:00
jinling.yang
4ce0a7670c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_base/models/sf_base.py
#	sf_manufacturing_orders/__manifest__.py
#	sf_route_workcenter/models/workcenter.py
 2022-11-16 09:43:10 +08:00
jinling.yang
98c3f868e9 123 2022-11-16 09:42:33 +08:00
gqh
ec9f82f09c 工作中心概述看板视图 2022-11-16 09:41:34 +08:00
gqh
ba92f616a0 工单优化更新 2022-11-15 16:16:21 +08:00
gqh
e23548a0d3 cnc程序上传 2022-11-11 10:31:37 +08:00
jinling.yang
8bc7cd0391 去掉不需要的文件 2022-11-09 10:38:35 +08:00
jinling.yang
aadbd80422 修改工单重复，业务平台分配工厂自动生成产品部分新增字段 2022-11-08 18:36:36 +08:00
gqh
8bb2af1f2a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2022-11-08 17:29:13 +08:00
gqh
822cca9755 合并代码 2022-11-08 17:28:28 +08:00
马广威
e0a520cb77 Accept Merge Request #38: (feature/1103_sf_machine_connect -> develop) 
Merge Request: 更新mrs_base_view视图，添加page

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/38
 2022-11-08 15:04:25 +08:00
马广威
65b46249e8 Merge branch develop into feature/1103_sf_machine_connect 2022-11-08 15:03:55 +08:00