Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

sf_bf_connect/models/jd_eclp.py

@@ -149,7 +149,7 @@ class JdEclp(models.Model):
             },
         }
         _logger.info('准备调接口1')
-        url1 = config['bfm_url'] + '/api/create/jd/order'
+        url1 = config['bfm_url_new'] + '/api/create/jd/order'
         requests.post(url1, json=json1, data=None)
         _logger.info('调用成功1')
         _logger.info('准备调接口2')
@@ -158,7 +158,7 @@ class JdEclp(models.Model):
                 'orderNo': self.origin,
             },
         }
-        url2 = config['bfm_url'] + '/api/get/jd/no'
+        url2 = config['bfm_url_new'] + '/api/get/jd/no'
         response = requests.post(url2, json=json2, data=None)
         # _logger.info('调用成功2', response.json()['result']['wbNo'])
         tem_ret = response.json().get('result')
@@ -196,7 +196,7 @@ class JdEclp(models.Model):
                 'no': self.origin,
             },
         }
-        url1 = config['bfm_url'] + '/api/create/jd/bill'
+        url1 = config['bfm_url_new'] + '/api/create/jd/bill'
         response = requests.post(url1, json=json1, data=None)
         # _logger.info('调用成功2', response.json())
 

sf_bf_connect/models/process_status.py

@@ -30,7 +30,7 @@ class StatusChange(models.Model):
                 'process_start_time': process_start_time,
             },
         }
-        url1 = config['bfm_url'] + '/api/get/state/get_order'
+        url1 = config['bfm_url_new'] + '/api/get/state/get_order'
         requests.post(url1, json=json1, data=None)
         logging.info('接口已经执行=============')
 
@@ -54,7 +54,7 @@ class StatusChange(models.Model):
                 'state': '待派单',
             },
         }
-        url1 = config['bfm_url'] + '/api/get/state/cancel_order'
+        url1 = config['bfm_url_new'] + '/api/get/state/cancel_order'
         requests.post(url1, json=json1, data=None)
 
         return res

sf_machine_connect/models/res_config_setting.py

@@ -8,11 +8,14 @@ _logger = logging.getLogger(__name__)
 class ResBFMConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
-    bfm_url = fields.Selection(
+    # bfm_url = fields.Selection(
-        [("https://bfm.cs.jikimo.com", "开发环境(https://bfm.cs.jikimo.com)"),
+    #     [("https://bfm.cs.jikimo.com", "开发环境(https://bfm.cs.jikimo.com)"),
-         ("https://bfm.t.jikimo.com", "测试环境(https://bfm.t.jikimo.com)"),
+    #      ("https://bfm.t.jikimo.com", "测试环境(https://bfm.t.jikimo.com)"),
-         # ("正式环境", "https://bfm.jikimo.com")], string='bfm环境', store=True)
+    #      ("https://bfm.r.jikimo.com", "预发布环境(https://bfm.r.jikimo.com)"),
-         ("https://bfm.jikimo.com", "正式环境(https://bfm.jikimo.com)")], string='bfm环境', store=True)
+    #      # ("正式环境", "https://bfm.jikimo.com")], string='bfm环境', store=True)
+    #      ("https://bfm.jikimo.com", "正式环境(https://bfm.jikimo.com)")], string='bfm环境', store=True)
+
+    bfm_url_new = fields.Char('业务平台环境路径', placeholder='请输入当前对应的业务平台环境路径')
 
     @api.model
     def get_values(self):
@@ -22,14 +25,14 @@ class ResBFMConfigSettings(models.TransientModel):
         """
         values = super(ResBFMConfigSettings, self).get_values()
         config = self.env['ir.config_parameter'].sudo()
-        bfm_url = config.get_param('bfm_url', default='')
+        bfm_url_new = config.get_param('bfm_url_new', default='')
 
         values.update(
-            bfm_url=bfm_url,
+            bfm_url_new=bfm_url_new,
         )
         return values
 
     def set_values(self):
         super(ResBFMConfigSettings, self).set_values()
         ir_config = self.env['ir.config_parameter'].sudo()
-        ir_config.set_param("bfm_url", self.bfm_url or "")
+        ir_config.set_param("bfm_url_new", self.bfm_url_new or "")

sf_machine_connect/views/res_config_settings_views.xml

@@ -14,8 +14,8 @@
                                 <div class="o_setting_left_pane"/>
                                     <div class="o_setting_right_pane">
                                         <div class="text-muted">
-                                            <label for="bfm_url" />
+                                            <label for="bfm_url_new" />
-                                            <field name="bfm_url" string="访问地址"/>
+                                            <field name="bfm_url_new" string="业务平台访问地址"/>
                                         </div>
                                     </div>
 <!--                                 </div> -->

sf_sale/models/quick_easy_order.py

@@ -158,7 +158,7 @@ class QuickEasyOrder(models.Model):
                 payload = {
                     'file_path': new_file_path,
                     'dest_path': new_folder_path,
-                    'back_url': config['bfm_url']
+                    'back_url': config['bfm_url_new']
                 }
                 response = requests.post(url, json=payload, headers=headers)
                 if response.status_code == 200:

sf_tool_management/wizard/wizard.py

@@ -1,6 +1,6 @@
 import logging
 
-from datetime import timedelta, datetime
+from datetime import timedelta, datetime, date
 
 from odoo import fields, models, api
 from odoo.exceptions import ValidationError
@@ -867,7 +867,7 @@ class StockPicking(models.Model):
         picking_id.button_validate()
 
     def _get_name_stock1(self, picking_type_id):
-        name = picking_type_id.sequence_id.prefix
+        name = f'{picking_type_id.sequence_id.prefix}DJ/{date.today().strftime("%y")}'
         stock_id = self.env['stock.picking'].sudo().search(
             [('name', 'like', name), ('picking_type_id', '=', picking_type_id.id)],
             limit=1,