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

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

Browse Source 
Merge Request: 调整行号取值

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1836?initial=true
This commit is contained in:
马广威
2025-02-24 15:00:23 +08:00
committed by Coding
parent 2e83a22540 7ab90143b6
commit 2baf739eb2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sf_manufacturing/wizard/sale_order_cancel.py
View File

@@ -161,8 +161,8 @@ class SFSaleOrderCancelLine(models.TransientModel):
if order.picking_ids:
b = 0
for picking in order.picking_ids:
b += 1
for move in picking.move_ids:
b += 1
vals = {
'wizard_id': wizard_id,
'sequence': sequence,
@@ -170,7 +170,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
'doc_name': '交货单',
'operation_type': '调拨',
'doc_number': picking.name,
'line_number': move.product_id.name.split('-')[-1] if move.product_id else '',
'line_number': b,
'product_name': f'[{move.product_id.default_code}] {move.product_id.name}' if move else '',
# 'quantity': picking.product_qty if hasattr(picking, 'product_qty') else 0,
'quantity': move.product_uom_qty,
@@ -219,7 +219,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
'doc_name': '制造订单',
'doc_number': mo.name,
'operation_type': '',
'line_number': mo.product_id.name.split('-')[-1] if mo.product_id else '',
'line_number': d,
'product_name': f'[{mo.product_id.default_code}] {mo.product_id.name}',
'quantity': mo.product_qty,
'doc_state': map_dict.get(mo.state, mo.state),
@@ -256,15 +256,16 @@ class SFSaleOrderCancelLine(models.TransientModel):
if mo.picking_ids:
f = 0
for picking in mo.picking_ids:
f += 1
for move in picking.move_ids:
f += 1
vals = {
'wizard_id': wizard_id,
'sequence': sequence,
'category': '制造',
'doc_name': '库存移动',
'doc_number': picking.name,
'line_number': move.product_id.name.split(' ')[0].split('-')[-1] if move.product_id else '',
'line_number': f,
'operation_type': picking.picking_type_id.name,
'product_name': move.product_id.name if move.product_id else '',
'quantity': move.product_uom_qty,
@@ -273,6 +274,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
}
lines.append(self.create(vals))
sequence += 1
break
# 检查制造订单的工单
if mo.workorder_ids:
@@ -285,7 +287,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
'category': '制造',
'doc_name': '工单',
'doc_number': workorder.name,
'line_number': mo.product_id.name.split('-')[-1] if mo.product_id else '',
'line_number': g,
'operation_type': '',
'product_name': f'[{mo.product_id.default_code}] {mo.product_id.name}',
'quantity': workorder.qty_production,
@@ -358,7 +360,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
'doc_name': '质检单',
'operation_type': '',
'doc_number': check.name,
'line_number': check.product_id.name.split('-')[-1] if check.product_id else '',
'line_number': i,
'product_name': f'[{check.product_id.default_code}] {check.product_id.name}',
'quantity': 1,
'doc_state': map_dict.get(check.quality_state, check.quality_state),