补货报告接口修改

service/tallyman_service.py

 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 import logging
 import logging
 
 
+from sqlalchemy import func
+
+from models.base_model import db
 from models.models import TallymanMachine, Machine, Hatch
 from models.models import TallymanMachine, Machine, Hatch
 
 
 logger = logging.getLogger(__name__)
 logger = logging.getLogger(__name__)
@@ -12,11 +15,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 +31,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(
@@ -45,6 +48,7 @@ class TallymanService(object):
         cur_machine['short_address'] = machine_info.short_address
         cur_machine['short_address'] = machine_info.short_address
         cur_machine['address'] = machine_info.address
         cur_machine['address'] = machine_info.address
         cur_machine['place_id'] = machine_info.place_id
         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()
+        cur_machine['empty_number'] = db.session.query(func.sum(Hatch.total_count - Hatch.left_count)).filter(
+            Hatch.machine_no == machine_info.machine_no,
+            Hatch.status == 2).scalar()
         return cur_machine
         return cur_machine