jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,233 Commits 134 Branches 31 Tags
03efa01a85671699c515c9bcf79c5f113cde9c6c
Commit Graph

231 Commits

Author SHA1 Message Date
qihao.gong@jikimo.com
47a408d034 制造标准改成执行标准 2023-10-27 10:31:10 +08:00
马广威
a5cb2dc93b Merge branch refs/heads/develop into refs/heads/feature/制造-计划优化 2023-10-23 00:21:20 +08:00
mgw
587e2a4e3e 修复sequence导致字段值移动位置的bug 2023-10-20 10:50:35 +08:00
qihao.gong@jikimo.com
53e307cd55 修改设备table的样式 修改关联品牌根据各不同类别展示 2023-10-12 14:10:29 +08:00
qihao.gong@jikimo.com
e505285a91 处理同步报错bug 2023-10-11 15:41:55 +08:00
qihao.gong@jikimo.com
ecb1f4140e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
#	sf_mrs_connect/models/sync_common.py
 2023-10-11 14:56:18 +08:00
jinling.yang
6b7b536236 1.优化同步cloud的静态资源库的定时器的代码 
2.新增能力特征库的接口
 2023-10-10 17:19:11 +08:00
qihao.gong@jikimo.com
b9d6e0ea35 材料型号同步接口修改 新增国际标准和材料应用 2023-10-09 17:35:39 +08:00
qihao.gong@jikimo.com
30cebea5a1 修改材料型号参数类型 2023-10-08 17:27:51 +08:00
qihao.gong@jikimo.com
681b769356 设备类别新增选项 2023-09-22 17:01:03 +08:00
jinling.yang
aa17de3384 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 
# Conflicts:
#	sf_dlm/views/product_template_view.xml
 2023-09-08 17:05:44 +08:00
jinling.yang
41641f69fe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 
# Conflicts:
#	sf_manufacturing/models/product_template.py
 2023-09-08 14:08:08 +08:00
yuxianghui
35afdd3b2a 刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段； 2023-09-08 10:20:52 +08:00
jinling.yang
3225916629 1.优化产品页面： 
①“产品类别”字段放在开票策略后面；“内部编码”和“条码”字段放在产品标签后面；当“产品类别”为“成品”时“上传模型文件“和“模型“字段放在"销售价格"前面；
②当“产品类别”为“刀具”时，且“刀具物料”字段为“整体式刀具”,"刀柄"或"夹头"时，页面根据选择的刀具物料而新增所对应需要的字段及页面布局展示
2.采购产品时，产品的“产品类别”为”刀具“且“刀具物料”为“整体式刀具”,"刀柄"或"夹头"时，在收货单进行验证操作时，优化实时注册到Cloud的动态资源里的工厂刀具物料的接口
3.优化“产品模板"模型的部分字段
 2023-09-07 17:46:22 +08:00
yuxianghui
ae3f7c9c0c 新增切削速度Vc对象，产品-整体式刀具物料新增切削速度Vc关联字段；删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 2023-09-06 17:24:08 +08:00
yuxianghui
5353630975 撤销制造-配置-刀具型号新增的参数；对产品刀具物料字段的限制优化 2023-09-06 16:48:07 +08:00
yuxianghui
0b8042f07a 配置-刀具型号新增整体式刀具能力参数补充；补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 2023-09-06 11:02:55 +08:00
WEB许何哲\xuhez
26f07a00c3 Merge branch 'develop' into feature/sf品牌页面表格样式的修改 2023-09-05 16:45:32 +08:00
WEB许何哲\xuhez
b47dbe29c0 修改tree视图样式bug 2023-09-05 16:44:42 +08:00
yuxianghui
c8129478d5 新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象；刀具物料查询新增上述五个关联对象；对产品的整体式刀具物料能力参数进行补充。 2023-09-04 17:29:20 +08:00
jinling.yang
7351ea675b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/快速订单Bug修复 2023-08-31 17:37:27 +08:00
WEB许何哲\xuhez
2b22215853 sf品牌页面表格的样式修改 2023-08-31 10:16:16 +08:00
jinling.yang
e64cf88809 1.加工工艺去掉form表单展示 
2.机床型号页面优化
 2023-08-30 16:26:19 +08:00
qihao.gong@jikimo.com
e6a68eb1eb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-29 15:48:48 +08:00
qihao.gong@jikimo.com
b7f2c4a000 sf修改设备table，品牌图片改成图片 2023-08-29 15:47:58 +08:00
WEB许何哲\xuhez
7713ade077 sf品牌页面表格样式的修改 2023-08-29 15:13:59 +08:00
yuxianghui
be0f62ffe0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理 
# Conflicts:
#	sf_base/models/fixture.py
#	sf_manufacturing/models/model_type.py
#	sf_manufacturing/models/product_template.py
#	sf_sale/models/quick_easy_order.py
 2023-08-29 11:21:13 +08:00
yuxianghui
5ccd754261 所有自建模块日志警告信息处理 2023-08-29 11:06:59 +08:00
jinling.yang
6e6b0b66d3 去掉警告 2023-08-29 10:22:12 +08:00
jinling.yang
fb717c22ad 1.模型为上色Bug修复（cloud代码注释引起） 
2.创建产品和订单未成功Bug修复
 2023-08-28 17:40:19 +08:00
yuxianghui
39feda07e5 自建模块日志警告信息处理 2023-08-28 17:31:41 +08:00
jinling.yang
425b926948 品牌Tree列表图片放在备注前面 2023-08-25 15:49:32 +08:00
jinling.yang
71ca6d27ce Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品模板优化 2023-08-25 15:47:16 +08:00
jinling.yang
7174de3de6 产品模板的型号手动输入时型号对象的编码，联装类型，夹具物料字段的值显示 2023-08-25 15:46:41 +08:00
qihao.gong@jikimo.com
caeff1e17a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-25 11:10:46 +08:00
qihao.gong@jikimo.com
a9954c1231 维保计划中维保项目可以上传多张图片 2023-08-25 11:10:28 +08:00
jinling.yang
e7d32e5041 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能 2023-08-24 17:32:59 +08:00
jinling.yang
55504c2725 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能 2023-08-24 17:32:25 +08:00
许何哲
a2f5dbd70d Accept Merge Request #341: (feature/必填字段label添加星号 -> develop) 
Merge Request: 修改看板样式

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/341?initial=true
 2023-08-24 09:04:02 +08:00
WEB许何哲\xuhez
f67c8169bf 修改看板样式 2023-08-24 09:02:15 +08:00
jinling.yang
f9e4b73fb0 新增上传模型功能 2023-08-23 17:34:06 +08:00
qihao.gong@jikimo.com
90868d4a09 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-23 14:37:20 +08:00
qihao.gong@jikimo.com
b01a5a4216 刀把类型新增bt50 修改同步品牌图片报错问题 2023-08-23 14:37:02 +08:00
jinling.yang
2ae7b2c8ec 页面名称加大醒目 2023-08-23 10:28:54 +08:00
jinling.yang
cd33fb9fb9 夹具型号同步修复 2023-08-23 10:09:47 +08:00
jinling.yang
3ab0fcb337 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局 2023-08-21 11:50:36 +08:00
jinling.yang
f6841e5e9f 同步材料型号及优化材料型号页面及新增拉伸强度，硬度，粗加工，精加工 2023-08-21 11:49:24 +08:00
qihao.gong@jikimo.com
ff60824291 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-21 10:28:12 +08:00
qihao.gong@jikimo.com
82322b5024 修改设备table和跳转到维保 设备改为维保 2023-08-21 10:27:50 +08:00
jinling.yang
eec6dce4fc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造基础数据删除按钮放开 2023-08-21 10:16:47 +08:00