[fix] 修改收料列表

sdddl_project/controllers/roke_work_order.py

@@ -21,19 +21,19 @@ class InheritEntrustOrderMain(Main):
 
 
     def _prepare_entrust_info_data(self, entrust_orders):
     def _prepare_entrust_info_data(self, entrust_orders):
         info = []
         info = []
-        for i in entrust_orders.filtered(lambda l: l.plan_qty > (l.finish_qty + l.unqualified_qty)):
+        for i in entrust_orders:
             user_tz = pytz.timezone(http.request.env.context.get('tz', "Asia/Shanghai"))
             user_tz = pytz.timezone(http.request.env.context.get('tz', "Asia/Shanghai"))
             date_dt = pytz.utc.localize(i.plan_date).astimezone(user_tz)
             date_dt = pytz.utc.localize(i.plan_date).astimezone(user_tz)
             plan_date = date_dt.strftime("%Y-%m-%d %H:%M:%S")
             plan_date = date_dt.strftime("%Y-%m-%d %H:%M:%S")
-            previours_work_order = i._get_previous_wo()
-            plan_qty = i.plan_qty - sum(
-                previours_work_order.record_ids.mapped('unqualified_qty')) if previours_work_order else i.plan_qty
+            allow_qty, default_qty = i._get_wo_allow_qty()
+            if allow_qty <= (i.finish_qty + i.unqualified_qty):
+                continue
             info.append({
             info.append({
                 'work_id': i.id,
                 'work_id': i.id,
                 'code': i.code,
                 'code': i.code,
                 'product_id': i.product_id.id,
                 'product_id': i.product_id.id,
                 'product': i.product_id.name,
                 'product': i.product_id.name,
-                'plan_qty': plan_qty,
+                'plan_qty': allow_qty,
                 'process': i.process_id.name,
                 'process': i.process_id.name,
                 'entrust_customer': i.entrust_customer.name,
                 'entrust_customer': i.entrust_customer.name,
                 'plan_date': plan_date,
                 'plan_date': plan_date,