diff --git a/apps/wpm/services.py b/apps/wpm/services.py index b9dea08d..d560efc8 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -785,7 +785,7 @@ def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime, if handover.type == Handover.H_NORMAL: if mtype == Handover.H_MERGE and handover.new_wm: wm_to = handover.new_wm - if wm_to.state != WMaterial.WM_OK or wm_to.material != wm_from.material or wm_to.defect != wm_from.defect: + if wm_to.state != wm_from.state or wm_to.material != wm_from.material or wm_to.defect != wm_from.defect: raise ParseError("正常合并到的车间库存状态或物料异常") else: wm_to, _ = WMaterial.objects.get_or_create(