qwe；

Controller/RentController.py

@@ -73,6 +73,9 @@ def rent_detail():
     rent_no = json_data['rent_no'] if 'rent_no' in json_data else ''
     rent_no = json_data['rent_no'] if 'rent_no' in json_data else ''
     hatch_no = json_data['hatch_no'] if 'hatch_no' in json_data else ''
     hatch_no = json_data['hatch_no'] if 'hatch_no' in json_data else ''
     # data = RentService.get_production_detail(rent_no, hatch_no)
     # data = RentService.get_production_detail(rent_no, hatch_no)
+    if not hatch_no:
+        data = RentService.get_no_production_detail(rent_no)
+    else:
         data = RentService.get_production_detail_new(rent_no, hatch_no)
         data = RentService.get_production_detail_new(rent_no, hatch_no)
     return jsonify(BASE_RESPONSE(data=data).to_dict())
     return jsonify(BASE_RESPONSE(data=data).to_dict())
 
 

Service/RentService.py

@@ -95,8 +95,7 @@ class RentService():
         return data
         return data
 
 
     @staticmethod
     @staticmethod
-    def get_production_detail_new(rent_no, hatch_no):
-        if not hatch_no:
+    def get_no_production_detail(rent_no):
         rent_detail = Rent.query.filter_by(rent_no=rent_no).first()
         rent_detail = Rent.query.filter_by(rent_no=rent_no).first()
         total_info = []
         total_info = []
         tmp = {
         tmp = {
@@ -117,7 +116,9 @@ class RentService():
         total_info.append(tmp)
         total_info.append(tmp)
         return total_info
         return total_info
 
 
-        else:
+    @staticmethod
+    def get_production_detail_new(rent_no, hatch_no):
+
         sql = '''
         sql = '''
                 SELECT rent.deposit, rent.is_over, production.is_return, production.total, production.return_hatch_no,
                 SELECT rent.deposit, rent.is_over, production.is_return, production.total, production.return_hatch_no,
                 production.rent_machine_id, rent.customer_id, rent.real_total, rent.rent_no, production.return_time,
                 production.rent_machine_id, rent.customer_id, rent.real_total, rent.rent_no, production.return_time,