Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组

# Conflicts:
#	sf_base/security/group_security.xml
#	sf_sale/security/group_security.xml
This commit is contained in:
jinling.yang
2023-12-06 14:56:31 +08:00
13 changed files with 220 additions and 56 deletions

View File

@@ -480,7 +480,7 @@ class ResMrpWorkOrder(models.Model):
# 重写工单开始按钮方法
def button_start(self):
if self.routing_type == '装夹':
if self.routing_type == '装夹' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
# 外协出库单,从“正在等待”变为“就绪”状态
if self.is_subcontract is True: