Commit Graph

24 Commits

Author SHA1 Message Date
jinling.yang
6ff307f364 1.优化sf的产品页面展示:新增服务产品的工艺参数字段,当产品类别为服务时,该字段出现出现,材料和型号隐藏;加工参数里的表面工艺参数字段的值显示为表面工艺+可选参数
2.修复sf的表面工艺工单及完成后的询价单
2023-04-03 17:42:31 +08:00
jinling.yang
bf010e2cca 去掉警告及开发表面工艺相关需求 2023-03-27 21:04:33 +08:00
gqh
84ef243b9f sf新增表面工艺参数同步接口和基础对象,新增dockerfile和requirements.txt文件 2023-03-14 14:56:18 +08:00
jinling.yang
d3e30a4c87 去掉权限代码 2023-02-02 09:57:01 +08:00
jinling.yang
e8d923df03 bfm分配工厂:
1.销售页面:客户的值为业务平台,
2.没有原材料,事务回滚
3.去掉注释和没用到的代码
2023-02-01 18:27:29 +08:00
jinling.yang
5e2d75b23e 修改胚料部分 2022-12-09 17:23:07 +08:00
jinling.yang
830f3bb35e 212 2022-11-21 20:04:56 +08:00
gqh
8776fc7d6c 合并代码 2022-11-07 11:21:31 +08:00
gqh
84cf25f39d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
#	sf_base/security/ir.model.access.csv
#	sf_base/views/mrs_common_view.xml
#	sf_route_workcenter/models/workcenter.py
2022-11-07 11:00:14 +08:00
gqh
a49a24e9e6 合并代码 2022-11-07 10:59:22 +08:00
jinling.yang
14d0d32ab6 匹配加工中心 2022-11-03 17:58:33 +08:00
gqh
671901cb8d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
#	sf_base/security/ir.model.access.csv
#	sf_base/views/mrs_common_view.xml
2022-11-03 15:11:09 +08:00
gqh
3dfbd7a1e4 新增工单字段 2022-11-03 15:09:36 +08:00
jinling.yang
ae85009a18 修复模板类型工序 2022-11-01 17:30:25 +08:00
jinling.yang
7067b29735 新增根据模型类型计算出产品的胚料尺寸 2022-10-31 17:34:44 +08:00
jinling.yang
71a925334e 生成产品的BOM上的加工工序 2022-10-26 17:27:32 +08:00
jinling.yang
33adc646e2 智能工厂-制造模块基础设置新增托盘 2022-10-19 15:46:07 +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
gqh
28d76109e7 同步系统化参数,同步每日数据 2022-09-29 17:35:20 +08:00
gqh
d9e6f45bc4 智能工厂定时同步基础数据完成 2022-09-28 17:37:22 +08:00
gqh
11b0675241 初次提交,智能工厂基础数据 2022-09-26 12:02:52 +08:00