Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory

apps/wpmw/serializers.py

@@ -25,6 +25,13 @@ class WprSerializer(CustomModelSerializer):
         model = Wpr
         fields = '__all__'
     
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        material_name = ret.get("material_name", "")
+        if material_name:
+            ret["process_name"] = material_name.split("|")[-1]
+        return ret
+
 class WprDetailSerializer(WprSerializer):
     mb_ = MaterialBatchSerializer(source='mb', read_only=True)
     wm_ = WMaterialSerializer(source='wm', read_only=True)

out_service/cd.py

@@ -118,7 +118,17 @@ class JSONRequestHandler(BaseHTTPRequestHandler):
             
         res = handle_bytes(resp)
         if isinstance(res, str):
-            self.error(res)
+            if res == "数据头不正确":
+                sc, resp = connect_and_send()
+                if sc is None or resp is None:
+                    return
+                res = handle_bytes(resp)
+                if isinstance(res, str):
+                    self.error(res)
+                else:
+                    self.ok(res)
+            else:
+                self.error(res)
         else:
             self.ok(res)