diff --git a/yuthon_catering/models/yuthon_catering.py b/yuthon_catering/models/yuthon_catering.py
index d79413d10..74c902a8a 100644
--- a/yuthon_catering/models/yuthon_catering.py
+++ b/yuthon_catering/models/yuthon_catering.py
@@ -305,10 +305,10 @@ class YuthonCatering(models.Model):
'lunch': True,
})
- def fill_march6_missing_catering(self):
- """表3月10日缺失员工的餐饮收集任务数据"""
+ def fill_march11_missing_catering(self):
+ """表3月11日缺失员工的餐饮收集任务数据"""
from datetime import date as date_cls
- target_date = date_cls(2026, 3, 10)
+ target_date = date_cls(2026, 3, 11)
conf_records = self.env['yuthon.catering.conf'].search([])
if not conf_records:
return
@@ -330,32 +330,6 @@ class YuthonCatering(models.Model):
if create_vals:
self.create(create_vals)
- def cron_fill_today_missing(self):
- """定时任务:自动补全当天缺失的餐饮收集数据,每天晚21:00执行,节假日/周末不触发"""
- today = fields.Date.today()
- if not self._process_shift_days(today):
- return
- conf_records = self.env['yuthon.catering.conf'].search([])
- if not conf_records:
- return
- employee_ids = conf_records.mapped('employee_ids')
- if not employee_ids:
- return
- create_vals = []
- for employee in employee_ids:
- existing = self.search([
- ('employee_id', '=', employee.id),
- ('date', '=', today),
- ], limit=1)
- if not existing:
- create_vals.append({
- 'date': today,
- 'employee_id': employee.id,
- 'state': 'unconfirmed',
- })
- if create_vals:
- self.create(create_vals)
-
def batch_generate_catering(self):
"""批量生成2025-12、2026-01、2026-02的餐饮收集任务数据,排除节假日"""
from datetime import date as date_cls
diff --git a/yuthon_catering/views/yuthon_catering.xml b/yuthon_catering/views/yuthon_catering.xml
index f7c4fa97a..769a2f2c2 100644
--- a/yuthon_catering/views/yuthon_catering.xml
+++ b/yuthon_catering/views/yuthon_catering.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/yuthon_purchase/models/inherit_purchase_order.py b/yuthon_purchase/models/inherit_purchase_order.py
index 7016e03bf..61eac7e4e 100644
--- a/yuthon_purchase/models/inherit_purchase_order.py
+++ b/yuthon_purchase/models/inherit_purchase_order.py
@@ -210,6 +210,7 @@ class InheritPurchaseOrderLine(models.Model):
_inherit = 'purchase.order.line'
category_id = fields.Many2one('product.category', string="产品分类")
+ brand_spec = fields.Char(string="品牌/规格")
category_ids = fields.Many2many('product.category', string="产品分类", compute='_compute_category_id')
@api.depends('category_id')
diff --git a/yuthon_purchase/views/inherit_purchase_order_views.xml b/yuthon_purchase/views/inherit_purchase_order_views.xml
index 911d272fe..b98b9872e 100644
--- a/yuthon_purchase/views/inherit_purchase_order_views.xml
+++ b/yuthon_purchase/views/inherit_purchase_order_views.xml
@@ -173,6 +173,9 @@
+
+
+