Merge branch 'develop' into feature/PDA扫码揽收

ccs_base/models/cc_history_package_good.py

@@ -29,9 +29,9 @@ class CcPackageGood(models.Model):
     bl_id = fields.Many2one('cc.bl')
 
     # 按item_id,唯一
-    _sql_constraints = [
-        ('item_id_uniq', 'unique(item_id)', 'The Item ID must be unique.')
-    ]
+    # _sql_constraints = [
+    #     ('item_id_uniq', 'unique(item_id)', 'The Item ID must be unique.')
+    # ]
 
     item_id = fields.Char(string='Item ID', index=True)
     # SKU标识ID

ccs_base/models/cc_history_ship_package.py

@@ -35,9 +35,9 @@ class CcHistoryShipPackage(models.Model):
     logistic_order_no = fields.Char(string='Logistic Order No', index=True)
 
     # 按logistic_order_no,唯一
-    _sql_constraints = [
-        ('logistic_order_no_uniq', 'unique(logistic_order_no)', 'The Logistic Order No must be unique.')
-    ]
+    # _sql_constraints = [
+    #     ('logistic_order_no_uniq', 'unique(logistic_order_no)', 'The Logistic Order No must be unique.')
+    # ]
 
     # 运单号(面单号)
     tracking_no = fields.Char(string='Tracking No', index=True)  # 对应面单号
@@ -177,3 +177,5 @@ class CcHistoryShipPackage(models.Model):
 
     # 增加同步日志纪录字段
     sync_log_ids = fields.One2many('cc.history.package.sync.log', 'package_id', 'Sync Logs')
+    # 消费者地址
+    receiver_detailed_address = fields.Char(string='Detailed Address', index=True)

ccs_base/models/res_config_setting.py

@@ -3,6 +3,7 @@
 import logging
 
 from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
 
 _logger = logging.getLogger(__name__)
 
@@ -11,6 +12,7 @@ class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     before_min = fields.Integer('清关时间取值（早于清关结束）')
+    package_scan_min = fields.Integer('一键全扫完成时间（min）', help='输入示范：10，即表示在10分钟内大包时间随机分配，并不能重复')
 
     @api.model
     def get_values(self):
@@ -21,9 +23,11 @@ class ResConfigSettings(models.TransientModel):
         values = super(ResConfigSettings, self).get_values()
         config = self.env['ir.config_parameter'].sudo()
         before_min = config.get_param('before_min', default=10)
+        package_scan_min = config.get_param('package_scan_min', default=10)
 
         values.update(
             before_min=before_min,
+            package_scan_min=package_scan_min,
         )
         return values
 
@@ -31,3 +35,4 @@ class ResConfigSettings(models.TransientModel):
         super(ResConfigSettings, self).set_values()
         ir_config = self.env['ir.config_parameter'].sudo()
         ir_config.set_param("before_min", self.before_min or 10)
+        ir_config.set_param("package_scan_min", self.package_scan_min or 10)

ccs_base/views/cc_history_big_package_view.xml

@@ -148,7 +148,7 @@
         <field name="res_model">cc.history.big.package</field>
         <field name="view_mode">tree,form,pivot,graph</field>
         <field name="domain">[]</field>
-        <field name="context">{'search_default_last_30d':1}</field>
+        <field name="context">{'search_default_last_30d':0}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 [History Big Package] Not yet! Click the Create button in the top left corner and the sofa is yours!

ccs_base/views/cc_history_package_good_view.xml

@@ -114,7 +114,7 @@
         <field name="arch" type="xml">
             <search string="Package Good">
                 <field name="item_name_en" string="Search"
-                       filter_domain="['|', ('item_id', 'ilike', self)'|', ('sku_id', 'ilike', self)'|', ('item_name_en', 'ilike', self), ('item_name_cn', 'ilike', self)]"/>
+                       filter_domain="['|', ('item_id', 'ilike', self), '|', ('sku_id', 'ilike', self), '|', ('item_name_en', 'ilike', self), ('item_name_cn', 'ilike', self)]"/>
                 <separator/>
                 <field name="item_id"/>
                 <field name="sku_id" string="SKU ID"/>

ccs_base/views/cc_history_ship_package_view.xml

@@ -177,6 +177,7 @@
                                 <field name="receiver_add_1" string="ADD 1"/>
                                 <field name="receiver_add_2" string="ADD 2"/>
                                 <field name="receiver_add_3" string="ADD 3"/>
+                                <field name="receiver_detailed_address"/>
                             </group>
                         </page>
                         <page string="Other">
@@ -274,6 +275,7 @@
                 <field name="receiver_add_1"/>
                 <field name="receiver_add_2"/>
                 <field name="receiver_add_3"/>
+                <field name="receiver_detailed_address"/>
                 <field name="actual_tax_currency" string="Actual Tax Currency"/>
                 <field name="actual_gst" string="Actual GST"/>
                 <field name="actual_tax" string="Actual Tax"/>
@@ -324,7 +326,7 @@
         <field name="res_model">cc.history.ship.package</field>
         <field name="view_mode">tree,form,search,pivot,graph</field>
         <field name="domain">[]</field>
-        <field name="context">{'search_default_last_30d':1}</field>
+        <field name="context">{'search_default_last_30d':0}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 [History Ship Package] Not yet! Click the Create button in the top left corner and the sofa is yours!

ccs_base/views/cc_package_good_view.xml

@@ -114,7 +114,7 @@
         <field name="arch" type="xml">
             <search string="Package Good">
                 <field name="item_name_en" string="Search"
-                       filter_domain="['|', ('item_id', 'ilike', self)'|', ('sku_id', 'ilike', self)'|', ('item_name_en', 'ilike', self), ('item_name_cn', 'ilike', self)]"/>
+                       filter_domain="['|', ('item_id', 'ilike', self), '|', ('sku_id', 'ilike', self), '|', ('item_name_en', 'ilike', self), ('item_name_cn', 'ilike', self)]"/>
                 <separator/>
                 <field name="item_id" string="Item ID"/>
                 <field name="sku_id" string="SKU ID"/>

ccs_base/views/history_tt_api_log.xml

@@ -95,7 +95,7 @@
             <field name="res_model">history.tt.api.log</field>
             <field name="view_mode">tree,form,search</field>
             <field name="domain">[]</field>
-            <field name="context">{'search_default_last_30d':1}</field>
+            <field name="context">{'search_default_last_30d':0}</field>
         </record>
 
 

ccs_base/views/res_config_setting.xml

@@ -21,6 +21,20 @@
                             </div>
                         </div>
                     </div>
+                    <div>
+                        <h2>pda扫码配置</h2>
+                        <div class="row mt16 o_settings_container" id="pda_scan">
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div class="o_setting_left_pane"/>
+                                <div class="o_setting_right_pane">
+                                    <div class="text-muted">
+                                        <label for="package_scan_min"/>
+                                        <field name="package_scan_min"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </xpath>
             </field>
         </record>

ccs_connect_tiktok/controllers/order_controller.py

@@ -89,6 +89,7 @@ class OrderController(http.Controller):
                 if bl_obj:
                     if bl_obj.state in state_arr:
                         res['bl_info'] = bl_obj.search_bl_info(pda_lang=pda_lang, type=action_type)
+                        res['package_scan_min'] = int(request.env['res.config.settings'].sudo().get_values().get('package_scan_min'))
                         res['state'] = 200
                     else:
                         res['message'] = bill_state_msg_dic[pda_lang]  # 没有在系统中找到未完成清关的该提单信息