jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,339 Commits 134 Branches 31 Tags
028eb18dd8edccd0527075d3e451328c9d59533e
Commit Graph

2339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
马广威
3d882f5492 Accept Merge Request #76: (feature/轨迹跟踪 -> develop) 
Merge Request: 物流前轨迹跟踪代码合并

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/76
 2023-01-09 14:42:37 +08:00
mgw
d088bc1c86 优化扫码部分 2023-01-08 16:51:24 +08:00
mgw
7c4baa4d91 加工中代码测试完成 2023-01-07 01:12:25 +08:00
mgw
0dbd941ed0 加工中轨迹跟踪代码 2023-01-06 16:47:40 +08:00
gqh
b53fddeec5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_manufacturing/models/mrp_workcenter.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/views/mrp_workorder_view.xml
 2023-01-04 10:35:38 +08:00
gqh
08efe7813d sf工单优化及权限 2023-01-04 10:13:29 +08:00
马广威
fd0d65867e Accept Merge Request #63: (feature/三元补偿值写入下张工单 -> develop) 
Merge Request: 合并三元补偿值写入

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/63
 2023-01-03 15:12:29 +08:00
mgw
be90cd933b 删除接口调用 2023-01-03 15:05:09 +08:00
mgw
a5f79ea97d 重写工单完成方法，添加接口调用 2023-01-03 11:08:39 +08:00
杨金灵
c023a13e3a Accept Merge Request #60: (feature/胚料问题修复 -> develop) 
Merge Request: 新增occ模块及部分bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/60
 2022-12-30 11:15:25 +08:00
jinling.yang
a3e39d4fac 产品和制造订单新增模型和occ查看模型模块 2022-12-30 10:00:17 +08:00
mgw
ac383797e0 将三元补偿值写入CNC加工工单 2022-12-28 16:44:24 +08:00
jinling.yang
5fcb17d048 胚料bug修复，销售订单明细行路线修复，编程单下发优化 2022-12-27 17:28:47 +08:00
jinling.yang
c6b9953e40 Merge branch 'feature/odoo16的代码修改' into develop 2022-12-26 10:26:01 +08:00
jinling.yang
a4be58098e 创建胚料的bug修复 2022-12-26 10:25:16 +08:00
jinling.yang
dd5c387585 解决代码冲突 2022-12-12 16:59:42 +08:00
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