jinling.yang
|
d5c2c8de86
|
新增排产的时候, 根据胚料的长宽高比对一下机床的最大加工尺寸.不符合就不要分配给这个加工中心(机床).
|
2023-02-16 17:35:08 +08:00 |
|
gqh
|
a3f350b69c
|
代码注释，前后置检查
|
2023-02-13 17:28:20 +08:00 |
|
jinling.yang
|
fc98ebb8c5
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化
|
2023-02-09 15:27:03 +08:00 |
|
jinling.yang
|
a812c603ea
|
代码规范整理，产品页面模型和胚料的模型类型字段做显示
|
2023-02-09 15:26:08 +08:00 |
|
gqh
|
f007542c35
|
合并dev
|
2023-02-09 14:34:43 +08:00 |
|
mgw
|
38f67d98f8
|
增加状态返回接口，增加调用京东接口
|
2023-02-09 08:50:48 +08:00 |
|
gqh
|
d032f89272
|
sf优化绑定托盘，工单form显示开始按钮 加工时间
|
2023-02-01 17:53:32 +08:00 |
|
gqh
|
5495f2436a
|
优化工单，英文改为中文展示，解除托盘展示托盘
|
2023-02-01 14:07:33 +08:00 |
|
jinling.yang
|
733e33adfd
|
新增胚料的模型类型
|
2023-01-30 18:11:29 +08:00 |
|
gqh
|
c212810d60
|
合并
|
2023-01-12 14:16:05 +08:00 |
|
jinling.yang
|
f5cfd50d33
|
cnc按钮展示问题，加工进度字段去掉注释
|
2023-01-11 16:32:48 +08:00 |
|
jinling.yang
|
6374388d7b
|
附件新增字段
|
2023-01-11 15:11:44 +08:00 |
|
gqh
|
8e51654f17
|
合并sf代码
|
2023-01-11 14:51:59 +08:00 |
|
gqh
|
aba5a076b1
|
合并
|
2023-01-11 14:08:12 +08:00 |
|
gqh
|
eb162cb416
|
合并工单优化
|
2023-01-11 11:13:52 +08:00 |
|
jinling.yang
|
01cf30b03f
|
优化涉及到的接口
|
2023-01-11 11:05:06 +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
|
311c7c723a
|
sf1.0
|
2023-01-09 23:04:53 +08:00 |
|
jinling.yang
|
0de2222009
|
cnc程序获取优化
|
2023-01-09 21:20:51 +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
|
d088bc1c86
|
优化扫码部分
|
2023-01-08 16:51:24 +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 |
|
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
|
a4be58098e
|
创建胚料的bug修复
|
2022-12-26 10:25:16 +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 |
|
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
|
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 |
|