优化分仓报价和发货咨询，完善订单状态解释

logistics_chat/quote_engine.py

@@ -20,6 +20,10 @@ def broad_zone(postal):
 
 
 def variants(intent, book):
+    if intent.get('allocations'):
+        return [{**destination,'allocation':part} for part in intent['allocations']
+                for destination in variants({**intent,'allocations':None,'warehouse':part['warehouse'],
+                    'warehouses':None,'postal':None},book)]
     if len(intent.get('warehouses') or [])>1:
         return [variant for warehouse in intent['warehouses'] for variant in
                 variants({**intent,'warehouse':warehouse,'warehouses':None,'postal':None},book)]
@@ -123,21 +127,27 @@ def render_rates(intent, book, destinations, remote_fees):
         lines.append(f"美国 {number(intent['weight'])}KG 基础运费：")
     else:
         lines.append('美国线路报价：')
-    if len(intent.get('warehouses') or [])>1:
+    if intent.get('quantity_note'):lines.append(intent['quantity_note'])
+    if intent.get('allocations'):
+        lines.append('按各目的仓分票计算，箱规需逐票核对：')
+    elif len(intent.get('warehouses') or [])>1:
         lines.append('以下按各目的仓分别比较；实际分票请提供每个仓的重量。')
     if intent.get('air_requested') and not intent.get('air_only'):
         lines.append('当前资料没有美国空运费率，下面列出海运方案。')
     for destination, fees in zip(destinations, remote_fees):
-        rates = match_rates(intent, book, destination)
+        part=destination.get('allocation')
+        billing=({**intent,'weight':part['weight'],'packages':part.get('packages'),'dims':None,'cbm':None,'boxes':part.get('boxes')}
+                 if part else intent)
+        rates = match_rates(billing, book, destination)
         if intent.get('mode') in ('cheapest','fastest') and rates:
             if intent['mode']=='cheapest':
-                eligible=[r for r in rates if quantity(intent,r) is not None]
+                eligible=[r for r in rates if quantity(billing,r) is not None]
                 best={}
                 for rate in eligible:
                     key=(destination['zone'] or rate['zone'],rate['unit'],rate['tax'])
-                    value=quantity(intent,rate)*Decimal(rate['price'])+charge_details(intent,rate,fees,book)['cny']
+                    value=quantity(billing,rate)*Decimal(rate['price'])+charge_details(billing,rate,fees,book)['cny']
                     best[key]=min(best.get(key,value),value)
-                rates=[r for r in eligible if quantity(intent,r)*Decimal(r['price'])+charge_details(intent,r,fees,book)['cny']==best[(destination['zone'] or r['zone'],r['unit'],r['tax'])]] or rates
+                rates=[r for r in eligible if quantity(billing,r)*Decimal(r['price'])+charge_details(billing,r,fees,book)['cny']==best[(destination['zone'] or r['zone'],r['unit'],r['tax'])]] or rates
                 lines.append('按相同区域、计费单位及税费方式比较的较低价方案：')
             else:
                 def eta_key(rate):
@@ -163,13 +173,13 @@ def render_rates(intent, book, destinations, remote_fees):
                 continue
             parts = []
             for rate in rows:
-                amount = quantity(intent,rate)
+                amount = quantity(billing,rate)
                 price = Decimal(rate['price'])
                 rate_text = f"{rate['zone']} " if rate['zone'] and not destination['zone'] else ''
                 rate_text += f"{number(price)}元/{'KG' if unit == 'kg' else 'CBM'}"
                 if amount is not None:
                     total = amount*price
-                    details=charge_details(intent,rate,fees,book)
+                    details=charge_details(billing,rate,fees,book)
                     total+=details['cny']
                     rate_text += f"，{number(amount,3)}{'KG' if unit == 'kg' else 'CBM'} = {number(total)}元"
                     if details['items']:rate_text+='（'+ '；'.join(details['items'])+'）'