jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
225 Commits 134 Branches 0 Tags
a812c603ea17f00e36189dbd9922ecd8b4700828
Commit Graph

44 Commits

Author SHA1 Message Date
gqh
2a3b334f73 sf新增修改网站标签功能 2023-02-06 16:10:03 +08:00
龚启豪
cba007b374 Accept Merge Request #131: (feature/优化工单 -> develop) 
Merge Request: 优化工单

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/131
 2023-02-03 17:16:46 +08:00
gqh
19d742d20f 优化工单 2023-02-03 17:14:17 +08:00
mgw
a4bee8bb6b 优化工单界面显示 2023-02-03 17:10:31 +08:00
gqh
59cb6e5def 优化工单界面，新增物料page，修复工单按钮bug，隐藏权限字段 2023-02-02 14:59:39 +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
7b78e2451a 工单的cnc工单加工面显示bug修复 2023-01-31 12:02:56 +08:00
龚启豪
8312b5fc6b Accept Merge Request #108: (feature/sf优化界面 -> develop) 
Merge Request: 修改登录背景，工作中心显示bug

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/108
 2023-01-31 11:08:04 +08:00
gqh
169bf4a59a 修改登录背景 2023-01-31 11:02:53 +08:00
杨金灵
210ee9d38d Accept Merge Request #107: (feature/修复sf的bug -> develop) 
Merge Request: 页面优化及部分bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/107
 2023-01-31 10:37:58 +08:00
gqh
fec18188fa 工作中心看板查看工单取消全屏 2023-01-30 17:56:41 +08:00
jinling.yang
271a5d4224 1.模型类型增加跟修改各字段 
2.智能工厂成品名称优化
3.智能工厂产品根据产品类型增加默认筛选条件的优化（在筛选器内根据产品类型增加筛选条件）
4.智能工厂胚料名称的优化
5.自加工产品的制造订单优化
 2023-01-29 17:48:45 +08:00
gqh
e93906a5f0 工作中心看板默认展示列表 2023-01-29 17:04:50 +08:00
gqh
a26d1ca2ba 三元输入坐标变色 2023-01-29 15:55:46 +08:00
gqh
e0ce0fcfa3 回滚 2023-01-29 15:48:50 +08:00
gqh
9125eedf5a 回滚 2023-01-29 15:48:12 +08:00
gqh
e6883a1f92 回滚 2023-01-29 15:47:46 +08:00
gqh
16623b3292 回滚 2023-01-29 15:47:18 +08:00
gqh
878e28791c 回滚 2023-01-29 15:46:58 +08:00
gqh
e319b282fc 回滚 2023-01-29 15:46:14 +08:00
gqh
bdae9d9f95 恢复代码 2023-01-29 15:42:33 +08:00
gqh
cfde389826 工单操作page默认在前面 2023-01-29 09:43:03 +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
gqh
8e51654f17 合并sf代码 2023-01-11 14:51:59 +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
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
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
jinling.yang
a3e39d4fac 产品和制造订单新增模型和occ查看模型模块 2022-12-30 10:00:17 +08:00
jinling.yang
5fcb17d048 胚料bug修复，销售订单明细行路线修复，编程单下发优化 2022-12-27 17:28:47 +08:00
gqh
e0a0b3d411 优化odoo16工单视图展示问题 2022-12-12 14:46:54 +08:00
jinling.yang
d6321bcb26 cnc对象修改 2022-11-28 12:21:39 +08:00
jinling.yang
6b9fe9167e 代码终版 2022-11-22 13:18:18 +08:00
jinling.yang
c3fdaf8d76 更改制造模块名 2022-11-22 09:41:52 +08:00