jinling.yang
|
97fcf6d91f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
# Conflicts:
# sf_base/views/base_view.xml
|
2023-08-17 18:03:12 +08:00 |
|
jinling.yang
|
8a99bd8589
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
|
2023-08-15 17:31:49 +08:00 |
|
jinling.yang
|
b3f2065edd
|
夹具物料注册
|
2023-08-07 17:29:17 +08:00 |
|
jinling.yang
|
5c2e7c80da
|
1.产品模板优化：增加产品类别的搜索面板
2.夹具型号注册到cloud：夹具型号的Tree和form视图去掉不可增删改操作，页面新增时编码根据夹具物料回显不同的编码；新增注册按钮及对应的注册接口
3.功能夹具注册到cloud：.功能夹具的Tree和form视图去掉不可增删改操作，页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显
|
2023-08-01 17:39:40 +08:00 |
|
jinling.yang
|
7c8e470199
|
产品新增搜索面板
|
2023-08-01 15:08:32 +08:00 |
|
jinling.yang
|
f68dce9ee2
|
修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug
|
2023-07-17 16:46:01 +08:00 |
|
jinling.yang
|
3743c65da9
|
优化夹具产品模板
|
2023-06-30 17:35:20 +08:00 |
|
jinling.yang
|
05227b9022
|
刀具产品模板根据型号展示不同字段和值
|
2023-06-29 18:53:11 +08:00 |
|
jinling.yang
|
37b834b3cf
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化
# Conflicts:
# sf_mrs_connect/models/res_config_setting.py
|
2023-06-29 11:15:40 +08:00 |
|
jinling.yang
|
eab6f0ceee
|
刀具产品页面刀具物料及型号字段修改
|
2023-06-28 18:32:45 +08:00 |
|
jinling.yang
|
c7ec8be141
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板
|
2023-06-15 16:14:50 +08:00 |
|
jinling.yang
|
34cc5bf125
|
新增刀具及刀具型号联动展示相关字段并显示对应信息，不同刀具的页面布局
|
2023-06-14 19:22:52 +08:00 |
|
jinling.yang
|
6068a55b79
|
新增sf的刀具模板的相关刀具物料字段
|
2023-06-13 17:30:35 +08:00 |
|
mgw
|
3d04200ca7
|
解决冲突
|
2023-06-12 14:35:14 +08:00 |
|
qihao.gong@jikimo.com
|
0077d97cfa
|
master-sf1.0
|
2023-05-06 16:03:00 +08:00 |
|
jinling.yang
|
b942696c69
|
1.销售模块的销售页面的订单行展示模型
2.表面工艺及类别菜单的排序
|
2023-04-24 17:09:16 +08:00 |
|
jinling.yang
|
2acdbca2b1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协
# Conflicts:
# sf_dlm/__manifest__.py
# sf_dlm/models/product_template.py
# sf_manufacturing/models/mrp_production.py
|
2023-04-21 15:40:03 +08:00 |
|
jinling.yang
|
82dcfb5018
|
优化及调试表面工艺外协出入库单，‘胚料’修改为‘坯料’
|
2023-04-20 19:39:12 +08:00 |
|
jinling.yang
|
a5c707bf43
|
判断外协工序是否连续有多个外协工序为同一个供应商（产品为表面工艺服务的供应商）,
|
2023-04-14 17:54:20 +08:00 |
|
qihao.gong@jikimo.com
|
d28525526a
|
合并企业版代码(未测试，先提交到测试分支)
|
2023-04-14 17:42:23 +08:00 |
|
jinling.yang
|
6ff307f364
|
1.优化sf的产品页面展示：新增服务产品的工艺参数字段，当产品类别为服务时，该字段出现出现，材料和型号隐藏；加工参数里的表面工艺参数字段的值显示为表面工艺+可选参数
2.修复sf的表面工艺工单及完成后的询价单
|
2023-04-03 17:42:31 +08:00 |
|
jinling.yang
|
20d9e469f5
|
表面工艺类别拖动排序
|
2023-03-29 17:48:03 +08:00 |
|
jinling.yang
|
93c9287717
|
修改表面工艺外协字段类型
|
2023-03-28 21:26:02 +08:00 |
|
jinling.yang
|
bf010e2cca
|
去掉警告及开发表面工艺相关需求
|
2023-03-27 21:04:33 +08:00 |
|
jinling.yang
|
446bd04a9d
|
新增同步mrs的表面工艺类别接口
|
2023-03-23 18:18:57 +08:00 |
|
qihao.gong@jikimo.com
|
0a2cd53400
|
解决报错
|
2023-03-23 15:10:59 +08:00 |
|
gqh
|
9807f515e9
|
工单展示组件
|
2023-03-21 13:58:46 +08:00 |
|
jinling.yang
|
8e41e772ff
|
产品创建时上传3D模型
|
2023-03-10 10:53:05 +08:00 |
|
jinling.yang
|
2df811d4ce
|
产品新增3d模型展示
|
2023-03-06 17:02:21 +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 |
|
jinling.yang
|
11065139d3
|
bom组件的公斤数量修复，产品页面的模型根据类型隐藏
|
2023-02-06 18:11:03 +08:00 |
|
gqh
|
59cb6e5def
|
优化工单界面，新增物料page，修复工单按钮bug，隐藏权限字段
|
2023-02-02 14:59:39 +08:00 |
|
jinling.yang
|
e8d923df03
|
bfm分配工厂:
1.销售页面：客户的值为业务平台，
2.没有原材料，事务回滚
3.去掉注释和没用到的代码
|
2023-02-01 18:27:29 +08:00 |
|
jinling.yang
|
07709af26a
|
Merge branch 'feature/修复sf的bug' into develop
|
2023-01-31 10:38:37 +08:00 |
|
jinling.yang
|
e2ae08c33f
|
制造和销售里的产品的筛选器，胚料的生成新增是否为业务平台新建字段，匹配bom修改为只能匹配手动建的bom
|
2023-01-31 10:32:14 +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
|
16cffc3ba5
|
单个制造显示问题
|
2023-01-29 16:33:56 +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
|
5492d4f2fa
|
修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复
|
2023-01-13 16:43:30 +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
|
b7723f82d0
|
优化sf获取cnc程序和ftp
|
2023-01-09 19:54:02 +08:00 |
|