Commit Graph

8 Commits

Author SHA1 Message Date
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
6dc2935741 采购入库若选择的产品是刀具,则优化序列号生成规则 2023-06-16 17:10:31 +08:00
qihao.gong@jikimo.com
23aba08c87 处理bug 2023-06-16 10:56:25 +08:00
qihao.gong@jikimo.com
018fecfc59 处理冲突 2023-06-16 10:02:33 +08:00