gqh
|
eb162cb416
|
合并工单优化
|
2023-01-11 11:13:52 +08:00 |
|
jinling.yang
|
d66687297d
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单文件优化
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2023-01-10 09:27:14 +08:00 |
|
gqh
|
d0497aa043
|
工单优化
|
2023-01-09 20:40:27 +08:00 |
|
jinling.yang
|
c3e5610b17
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化sf
# Conflicts:
# sf_manufacturing/models/__init__.py
# sf_manufacturing/models/mrp_workcenter.py
# sf_manufacturing/models/mrp_workorder.py
# sf_manufacturing/views/mrp_workorder_view.xml
|
2023-01-09 20:33:53 +08:00 |
|
jinling.yang
|
b7723f82d0
|
优化sf获取cnc程序和ftp
|
2023-01-09 19:54:02 +08:00 |
|
mgw
|
7c4baa4d91
|
加工中代码测试完成
|
2023-01-07 01:12:25 +08:00 |
|
mgw
|
0dbd941ed0
|
加工中轨迹跟踪代码
|
2023-01-06 16:47:40 +08:00 |
|
jinling.yang
|
a3e39d4fac
|
产品和制造订单新增模型和occ查看模型模块
|
2022-12-30 10:00:17 +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
|
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
|
8fce929022
|
从ftp获取cnc程序文件
|
2022-11-30 11:25:37 +08:00 |
|
jinling.yang
|
6b9fe9167e
|
代码终版
|
2022-11-22 13:18:18 +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 |
|
mgw
|
99d56cb53e
|
将采集到的数据添加到机床对象的page中
|
2022-11-03 17:37:19 +08:00 |
|
gqh
|
60bd5002bc
|
解决单一制造出库单bug
|
2022-10-19 17:19:43 +08:00 |
|
jinling.yang
|
e86a82c4b9
|
智能工厂接口新增相关字段
|
2022-10-10 23:13:35 +08:00 |
|
gqh
|
839de4c95f
|
更新sf
|
2022-10-10 10:52:24 +08:00 |
|
jinling.yang
|
b3d1972943
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2022-10-08 17:33:45 +08:00 |
|
jinling.yang
|
373400ed53
|
修改智能工厂接收业务平台订单接口
|
2022-10-08 17:33:27 +08:00 |
|
gqh
|
14ef518bd5
|
注册机床
|
2022-10-08 15:43:44 +08:00 |
|
jinling.yang
|
5b333fb1a6
|
这2个文件暂时废弃
|
2022-10-07 23:47:34 +08:00 |
|
jinling.yang
|
118e4ff2b6
|
新增获取业务平台订单接口
|
2022-10-07 23:46:33 +08:00 |
|
jinling.yang
|
f456fba884
|
智能工厂的销售模块添加业务平台订单对象
|
2022-10-01 00:34:09 +08:00 |
|
gqh
|
11b0675241
|
初次提交，智能工厂基础数据
|
2022-09-26 12:02:52 +08:00 |
|