update

myapps/sukang24h/api/tallyman_portal.py

@@ -347,15 +347,16 @@ def get_tally_report():
 def run_machine_activate():
 def run_machine_activate():
     json_data = request.get_json()
     json_data = request.get_json()
     qrcode_no = json_data["qrcode_no"]
     qrcode_no = json_data["qrcode_no"]
-    machine_no = json_data["machine_no"]
-    mac = json_data["mac"]
+    # machine_no = json_data["machine_no"]
+    mac = json_data.get("mac", None)
 
 
     machine = Machine.query.filter_by(qrcode_no=qrcode_no).first()
     machine = Machine.query.filter_by(qrcode_no=qrcode_no).first()
     if machine and machine.machine_no == qrcode_no:
     if machine and machine.machine_no == qrcode_no:
         if machine.status == 1:
         if machine.status == 1:
             return jsonify(MACHINE_ACTIVATED_ERROR)
             return jsonify(MACHINE_ACTIVATED_ERROR)
         machine.status = 1
         machine.status = 1
-        machine.mac = mac
+        if mac:
+            machine.mac = mac
         db.session.add(machine)
         db.session.add(machine)
         db.session.commit()
         db.session.commit()
         return BaseResponse()
         return BaseResponse()