jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1839: (feature/制造功能优化 -> develop)

Browse Source 
Merge Request: 调整工单名称、编程单去重

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1839?initial=true
This commit is contained in:
马广威
2025-02-24 15:29:53 +08:00
committed by Coding
parent 363169d9e4 fea58e6288
commit 332ac49229
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sf_manufacturing/wizard/sale_order_cancel.py
View File

@@ -211,6 +211,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
d = 0 d = 0
# 在领料单处只进行一次 # 在领料单处只进行一次
flag = True flag = True
program_list = []
for mo in manufacturing_orders: for mo in manufacturing_orders:
# 添加制造订单本身 # 添加制造订单本身
d += 1 d += 1
@@ -288,7 +289,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
'sequence': sequence, 'sequence': sequence,
'category': '制造', 'category': '制造',
'doc_name': '工单', 'doc_name': '工单',
'doc_number': workorder.name, 'doc_number': f'{mo.name}-{workorder.name}',
'line_number': g, 'line_number': g,
'operation_type': '', 'operation_type': '',
'product_name': f'[{mo.product_id.default_code}] {mo.product_id.name}', 'product_name': f'[{mo.product_id.default_code}] {mo.product_id.name}',
@@ -387,9 +388,14 @@ class SFSaleOrderCancelLine(models.TransientModel):
'doc_state': cloud_programming['programming_state'], 'doc_state': cloud_programming['programming_state'],
'cancel_reason': '' 'cancel_reason': ''
} }
lines.append(self.create(vals)) program_list.append(self.create(vals))
sequence += 1 unique_lines = {}
return lines for line in program_list:
doc_number = line.doc_number
if doc_number not in unique_lines:
unique_lines[doc_number] = line
return lines + list(unique_lines.values())
# unique_lines = {} # unique_lines = {}
# for line in lines: # for line in lines: