update

myapps/sukang24h/api/tallyman_portal.py

@@ -328,12 +328,14 @@ def run_tally_over():
 @tallyman_route.route("/tally_report", methods=["POST"])
 @tallyman_route.route("/tally_report", methods=["POST"])
 def get_tally_report():
 def get_tally_report():
     json_data = request.get_json()
     json_data = request.get_json()
-    machine_info = TallymanService.get_machine_list(g.user)
-    empty_number = 0
-    for i in machine_info:
-        empty_number += int(i["empty_number"])
+    machine_no = json_data["machine_no"]
+    machine_info = TallymanService.get_machine_info(g.user, machine_no)
+    if not machine_info:
+        return jsonify(MACHINE_NOT_EXIST_ERROR)
+    empty_number = int(machine_info["empty_number"])
 
 
     over_number = TallyRecord.query.filter(TallyRecord.user_no == g.user.user_no,
     over_number = TallyRecord.query.filter(TallyRecord.user_no == g.user.user_no,
+                                           TallyRecord.machine_no == machine_no,
                                            TallyRecord.status == 2).count()
                                            TallyRecord.status == 2).count()
 
 
     return BaseResponse(data={"empty_number": empty_number, "over_number": over_number})
     return BaseResponse(data={"empty_number": empty_number, "over_number": over_number})

service/tallyman_service.py

@@ -12,11 +12,11 @@ class TallymanService(object):
         machine_infos = Machine.query.join(TallymanMachine,
         machine_infos = Machine.query.join(TallymanMachine,
                                            TallymanMachine.machine_no == Machine.machine_no).filter(
                                            TallymanMachine.machine_no == Machine.machine_no).filter(
             TallymanMachine.user_id == tallyman.id, TallymanMachine.status == 1).all()
             TallymanMachine.user_id == tallyman.id, TallymanMachine.status == 1).all()
-
+        
         # machine_infos = db.session.query(Machine).join(TallymanMachine,
         # machine_infos = db.session.query(Machine).join(TallymanMachine,
         #                                                TallymanMachine.machine_no == Machine.machine_no).filter(
         #                                                TallymanMachine.machine_no == Machine.machine_no).filter(
         #     TallymanMachine.user_id == tallyman.id, TallymanMachine.status == 1).all()
         #     TallymanMachine.user_id == tallyman.id, TallymanMachine.status == 1).all()
-
+        
         return_data = []
         return_data = []
         for tmp_machine in machine_infos:
         for tmp_machine in machine_infos:
             cur_machine = {}
             cur_machine = {}
@@ -28,7 +28,7 @@ class TallymanService(object):
                                                              Hatch.status == 2).count()
                                                              Hatch.status == 2).count()
             return_data.append(cur_machine)
             return_data.append(cur_machine)
         return return_data
         return return_data
-
+    
     @classmethod
     @classmethod
     def get_machine_info(cls, tallyman, machine_no):
     def get_machine_info(cls, tallyman, machine_no):
         machine_info = Machine.query.join(
         machine_info = Machine.query.join(
@@ -40,4 +40,11 @@ class TallymanService(object):
         ).first()
         ).first()
         if not machine_info:
         if not machine_info:
             return None
             return None
-        return machine_info
+        cur_machine = {}
+        cur_machine['machine_no'] = machine_info.machine_no
+        cur_machine['short_address'] = machine_info.short_address
+        cur_machine['address'] = machine_info.address
+        cur_machine['place_id'] = machine_info.place_id
+        cur_machine['empty_number'] = Hatch.query.filter(Hatch.machine_no == machine_info.machine_no,
+                                                         Hatch.status == 2).count()
+        return cur_machine