diff --git a/apps/wpm/scripts/batch_gxerp.py b/apps/wpm/scripts/batch_gxerp.py index 17470f7f..85c4b7c4 100644 --- a/apps/wpm/scripts/batch_gxerp.py +++ b/apps/wpm/scripts/batch_gxerp.py @@ -88,11 +88,22 @@ def main(batch: str): data["外观检验_总合格率"] = round((data["外观检验_总合格数"] / data["外观检验_count_real"])*100, 2) except decimal.InvalidOperation: data["外观检验_总合格率"] = 0 + + data["外观检验_完全总合格数"] = data["外观检验_count_ok_full"] + data["外观检验_返修_count_ok_full"] if "外观检验_返修_count_ok_full" in data else 0 + try: + data["外观检验_完全总合格率"] = round((data["外观检验_完全总合格数"] / data["外观检验_count_real"])*100, 2) + except decimal.InvalidOperation: + data["外观检验_完全总合格率"] = 0 try: data["外观检验_直通合格率"] = round((data["外观检验_总合格率"]* data["尺寸检验_合格率"])/100, 2) except decimal.InvalidOperation: data["外观检验_直通合格率"] = 0 + + try: + data["外观检验_完全直通合格率"] = round((data["外观检验_完全总合格率"]* data["尺寸检验_完全合格率"])/100, 2) + except decimal.InvalidOperation: + data["外观检验_完全直通合格率"] = 0 return data, {}