马广威
|
dcdb3534dd
|
Accept Merge Request #145: (feature/优化NC下发 -> develop)
Merge Request: NC下发测试成功，请求合并
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/145?initial=true
|
2023-02-27 14:57:30 +08:00 |
|
gqh
|
4ec5f2c1de
|
验证坯料序列号
|
2023-02-24 17:23:00 +08:00 |
|
mgw
|
28659bfc95
|
增加合并下发向导，增加cnc模型的缺省tree视图
|
2023-02-23 08:52:56 +08:00 |
|
gqh
|
7ddaace1ad
|
序列号去除中文（打印条形码不能带中文否则会报错）
|
2023-02-22 17:14:42 +08:00 |
|
马广威
|
d81cf77bbe
|
Accept Merge Request #142: (feature/优化进度反馈 -> develop)
Merge Request: 京东物流对接sf端基本完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/142?initial=true
|
2023-02-17 15:30:08 +08:00 |
|
杨金灵
|
97c64ff290
|
Accept Merge Request #141: (feature/页面优化 -> develop)
Merge Request: 页面优化及排产（根据胚料的长宽高比对一下机床的最大加工尺寸）
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/141?initial=true
|
2023-02-17 15:03:05 +08:00 |
|
jinling.yang
|
d978f9d9b2
|
排产的时候, 根据胚料的长宽高比对一下机床的最大加工尺寸.不符合就不要分配给这个加工中心(机床).
|
2023-02-17 15:01:43 +08:00 |
|
gqh
|
9d59917af9
|
CNC获取程序工单自动开始 并获取cnc程序到mrs编程单
|
2023-02-16 17:48:26 +08:00 |
|
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
|
b3bfe48c67
|
优化工单
|
2023-02-03 17:53:46 +08:00 |
|
jinling.yang
|
a06e7cdb83
|
去掉不要的代码
|
2023-02-02 09:58:47 +08:00 |
|
jinling.yang
|
e8d923df03
|
bfm分配工厂:
1.销售页面：客户的值为业务平台，
2.没有原材料，事务回滚
3.去掉注释和没用到的代码
|
2023-02-01 18:27:29 +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 |
|
jinling.yang
|
271a5d4224
|
1.模型类型增加跟修改各字段
2.智能工厂成品名称优化
3.智能工厂产品根据产品类型增加默认筛选条件的优化（在筛选器内根据产品类型增加筛选条件）
4.智能工厂胚料名称的优化
5.自加工产品的制造订单优化
|
2023-01-29 17:48:45 +08:00 |
|
gqh
|
bdae9d9f95
|
恢复代码
|
2023-01-29 15:42:33 +08:00 |
|
gqh
|
9c473e6f32
|
优化sf
|
2023-01-23 20:21:00 +08:00 |
|
jinling.yang
|
270b8d3cc1
|
修复工作中心绑定机床和胚料外协供应商外包未勾选问题
|
2023-01-13 16:47:12 +08:00 |
|
jinling.yang
|
5492d4f2fa
|
修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复
|
2023-01-13 16:43:30 +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
|
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
|
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 |
|