feat: inm 生产领料/入库支持带 defect 物料并按 okcate 推导 state

去除 do_out 对 defect 非空的硬拦截,do_out/do_in 中查询与创建
MaterialBatch、WMaterial 时按 defect.okcate==DEFECT_NOTOK 推导
state=WM_NOTOK,与 update_mb_item 保持一致,撤销路径同步打通。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
caoqianming 2026-05-12 08:51:08 +08:00
parent 5354557f4a
commit 70f2d0d2dd
1 changed files with 23 additions and 18 deletions

View File

@ -13,9 +13,6 @@ def do_out(item: MIOItem, is_reverse: bool = False):
""" """
生产领料到车间 生产领料到车间
""" """
if item.mb and item.mb.defect is not None:
raise ParseError("生产领料不支持不合格品")
from apps.inm.models import MaterialBatch from apps.inm.models import MaterialBatch
mio:MIO = item.mio mio:MIO = item.mio
belong_dept = mio.belong_dept belong_dept = mio.belong_dept
@ -75,6 +72,10 @@ def do_out(item: MIOItem, is_reverse: bool = False):
xcount:str = al[2] xcount:str = al[2]
defect:Defect = al[3] defect:Defect = al[3]
state = WMaterial.WM_OK
if defect and defect.okcate in [Defect.DEFECT_NOTOK]:
state = WMaterial.WM_NOTOK
xbatches.append(xbatch) xbatches.append(xbatch)
if xcount <= 0: if xcount <= 0:
raise ParseError("存在非正数!") raise ParseError("存在非正数!")
@ -85,7 +86,7 @@ def do_out(item: MIOItem, is_reverse: bool = False):
material=xmaterial, material=xmaterial,
warehouse=item.warehouse, warehouse=item.warehouse,
batch=xbatch, batch=xbatch,
state=WMaterial.WM_OK, state=state,
defect=defect defect=defect
) )
except (MaterialBatch.DoesNotExist, MaterialBatch.MultipleObjectsReturned) as e: except (MaterialBatch.DoesNotExist, MaterialBatch.MultipleObjectsReturned) as e:
@ -101,7 +102,7 @@ def do_out(item: MIOItem, is_reverse: bool = False):
wm, new_create = WMaterial.objects.get_or_create( wm, new_create = WMaterial.objects.get_or_create(
batch=xbatch, material=xmaterial, batch=xbatch, material=xmaterial,
belong_dept=belong_dept, mgroup=mgroup, belong_dept=belong_dept, mgroup=mgroup,
state=WMaterial.WM_OK, defect=defect) state=state, defect=defect)
if new_create: if new_create:
wm.create_by = do_user wm.create_by = do_user
wm.batch_ofrom = mb.batch if mb else None wm.batch_ofrom = mb.batch if mb else None
@ -176,6 +177,10 @@ def do_in(item: MIOItem):
if xcount <= 0: if xcount <= 0:
raise ParseError("存在非正数!") raise ParseError("存在非正数!")
state = WMaterial.WM_OK
if defect and defect.okcate in [Defect.DEFECT_NOTOK]:
state = WMaterial.WM_NOTOK
xbatchs.append(xbatch) xbatchs.append(xbatch)
if xmaterial.into_wm: if xmaterial.into_wm:
if xwm: if xwm:
@ -187,7 +192,7 @@ def do_in(item: MIOItem):
belong_dept=belong_dept, belong_dept=belong_dept,
mgroup=mgroup, mgroup=mgroup,
defect=defect, defect=defect,
state=WMaterial.WM_OK) state=state)
count_x = wm_qs.count() count_x = wm_qs.count()
if count_x == 1: if count_x == 1:
wm = wm_qs.first() wm = wm_qs.first()
@ -219,7 +224,7 @@ def do_in(item: MIOItem):
material=xmaterial, material=xmaterial,
warehouse=item.warehouse, warehouse=item.warehouse,
batch=xbatch, batch=xbatch,
state=WMaterial.WM_OK, state=state,
defect=defect, defect=defect,
defaults={ defaults={
"count": 0, "count": 0,