From 438628ce46051c363ad6c310248acfc30bce1c6e Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Tue, 25 Apr 2023 14:42:34 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3coding=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/models/http.py              | 4 ----
 sf_bf_connect/models/jd_eclp.py           | 2 +-
 sf_manufacturing/models/mrp_production.py | 8 ++++----
 sf_manufacturing/models/tray.py           | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sf_bf_connect/models/http.py b/sf_bf_connect/models/http.py
index eb969eb6..196c52bb 100644
--- a/sf_bf_connect/models/http.py
+++ b/sf_bf_connect/models/http.py
@@ -13,10 +13,6 @@ _logger = logging.getLogger(__name__)
 class AuthenticationError(Exception):
     pass
 
-class AuthenticationError(Exception):
-    pass
-
-
 class Http(models.AbstractModel):
     _inherit = 'ir.http'
 
diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index 030d3da2..09540779 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -1,4 +1,4 @@
-#import cpca
+import cpca
 import logging
 import base64
 import requests
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 1f9d6963..a17a2c08 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -327,9 +327,9 @@ class MrpProduction(models.Model):
             #     workorder.duration_expected = workorder._get_duration_expected()
 
     def _create_workorder2(self, k):
-        res = self._create_workorder1(k)
+        self._create_workorder1(k)
         self._reset_work_order_sequence1(k)
-        return res
+        return True
 
     def _reset_work_order_sequence(self):
         for rec in self:
@@ -344,6 +344,6 @@ class MrpProduction(models.Model):
 
     # 创建工单并进行排序
     def _create_workorder(self):
-        res = self._create_workorder3()
+        self._create_workorder3()
         self._reset_work_order_sequence()
-        return res
+        return True
diff --git a/sf_manufacturing/models/tray.py b/sf_manufacturing/models/tray.py
index 1ba0bea7..4a691c50 100644
--- a/sf_manufacturing/models/tray.py
+++ b/sf_manufacturing/models/tray.py
@@ -3,7 +3,7 @@
 import base64
 from io import BytesIO
 from odoo import api, fields, models
-#from pystrich.code128 import Code128Encoder
+from pystrich.code128 import Code128Encoder
 
 
 class Tray(models.Model):

From 1be003e000ff95c9c730fe955afe0c6133eb8a35 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Tue, 25 Apr 2023 16:22:09 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=96=B0=E5=A2=9Ecpca=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index e44a0bee..62ceaf1b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
 pystrich
+cpca

From 4c75417f2a8abf389f63a485fe296e1b2d4c5e19 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 25 Apr 2023 22:22:26 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/views/compensation.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index 4804df61..a6f47b23 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -19,8 +19,6 @@
                                     class="btn-primary" attrs='{"invisible": ["|",
                                     ("state","!=","progress"),("user_permissions","=",False)]}'/>
                                 <span>&#32;</span>
-<!--                                <field name="button_up_all_state" attrs='{"invisible": ["|",-->
-<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
                                 <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"
                                     class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
                                     ("state","!=","progress"),("user_permissions","=",False)]}'/>

From ad8651aa11d6b9c5a5244746cd7546514e620766 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Wed, 26 Apr 2023 10:10:06 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/common_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index 82e1e918..759cb51e 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -259,7 +259,7 @@
                             <tree string="材料型号">
                                 <field name="materials_no"/>
                                 <field name="name"/>
-                                <field name="need_h"/>
+<!--                                <field name="need_h"/>-->
                                 <field name="mf_materia_post"/>
                                 <field name="density"/>
                                 <field name='materials_id' default="default" invisible="1"/>

From f85c9166f139646ffd9f9ecb7400bc53d76d45a1 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Wed, 26 Apr 2023 10:33:03 +0800
Subject: [PATCH 5/9] =?UTF-8?q?devops=E6=B5=81=E7=A8=8B=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/common_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index 759cb51e..82e1e918 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -259,7 +259,7 @@
                             <tree string="材料型号">
                                 <field name="materials_no"/>
                                 <field name="name"/>
-<!--                                <field name="need_h"/>-->
+                                <field name="need_h"/>
                                 <field name="mf_materia_post"/>
                                 <field name="density"/>
                                 <field name='materials_id' default="default" invisible="1"/>

From 69aa7319901b5c33403b939308300547e0784df4 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 26 Apr 2023 17:35:03 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B9=B3=E6=9D=BF?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=BB=91=E5=AE=9A=E6=89=98=E7=9B=98=E7=9A=84?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=BD=A2=E5=BC=8F=E4=BB=A5=E5=8F=8A=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/static/src/js/barcode_button.js   | 5 ++---
 sf_machine_connect/static/src/xml/barcode_button.xml | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sf_machine_connect/static/src/js/barcode_button.js b/sf_machine_connect/static/src/js/barcode_button.js
index 8bd48d65..c6554598 100644
--- a/sf_machine_connect/static/src/js/barcode_button.js
+++ b/sf_machine_connect/static/src/js/barcode_button.js
@@ -98,9 +98,8 @@ export class CodeField extends Component {
                     }]);
                   console.log(updatetrayRecord)
                 });
-                this.props.update(records[0].code, records[0].tray_id);
-                location.replace(location.href)
-                // location.reload()
+                this.props.update(records[0].code);
+                $('.o_form_button_save').click();
             } else {
                 if (records[0].state === '占用') {
                     console.log('此托盘已占用，请检查')
diff --git a/sf_machine_connect/static/src/xml/barcode_button.xml b/sf_machine_connect/static/src/xml/barcode_button.xml
index 215f4cd0..d380e222 100644
--- a/sf_machine_connect/static/src/xml/barcode_button.xml
+++ b/sf_machine_connect/static/src/xml/barcode_button.xml
@@ -12,7 +12,6 @@
                     aria-label="Scan barcode"
                     title="Scan barcode"
                     data-tooltip="Scan barcode"
-                    style="position: absolute !important;"
                 />
                 </div>
 

From ca8b4c6086c3ac66343ff9ec5142efe0e3b9b0df Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Thu, 27 Apr 2023 14:46:57 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/common_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index 82e1e918..b529980c 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -257,12 +257,12 @@
                         </group>
                         <field name="materials_model_ids" widget="ony2many">
                             <tree string="材料型号">
-                                <field name="materials_no"/>
+<!--                                <field name="materials_no"/>-->
                                 <field name="name"/>
-                                <field name="need_h"/>
-                                <field name="mf_materia_post"/>
-                                <field name="density"/>
-                                <field name='materials_id' default="default" invisible="1"/>
+<!--                                <field name="need_h"/>-->
+<!--                                <field name="mf_materia_post"/>-->
+<!--                                <field name="density"/>-->
+<!--                                <field name='materials_id' default="default" invisible="1"/>-->
                             </tree>
                         </field>
 

From f7e234e1b91235d11ecdda96bf836f4fd9102e5b Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Thu, 27 Apr 2023 15:19:03 +0800
Subject: [PATCH 8/9] =?UTF-8?q?devops=E6=B5=8B=E8=AF=95=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/common_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index b529980c..82e1e918 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -257,12 +257,12 @@
                         </group>
                         <field name="materials_model_ids" widget="ony2many">
                             <tree string="材料型号">
-<!--                                <field name="materials_no"/>-->
+                                <field name="materials_no"/>
                                 <field name="name"/>
-<!--                                <field name="need_h"/>-->
-<!--                                <field name="mf_materia_post"/>-->
-<!--                                <field name="density"/>-->
-<!--                                <field name='materials_id' default="default" invisible="1"/>-->
+                                <field name="need_h"/>
+                                <field name="mf_materia_post"/>
+                                <field name="density"/>
+                                <field name='materials_id' default="default" invisible="1"/>
                             </tree>
                         </field>
 

From cdb5493461cf78adc064faf884ba73781b179a10 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 12 May 2023 17:36:59 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E9=AA=8C=E8=AF=81=E5=89=8D=E7=BD=AE=E5=92=8C=E5=90=8E?=
 =?UTF-8?q?=E7=BD=AE=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=A4=96=E5=8D=8F=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E7=82=B9=E5=87=BB=E5=AE=8C=E6=88=90=E6=97=B6=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E8=AF=A2=E4=BB=B7=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py |  1 -
 sf_manufacturing/models/mrp_workorder.py  | 63 +++++++++--------------
 sf_manufacturing/models/stock.py          | 25 +++++++--
 3 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index a17a2c08..04cb1f48 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -339,7 +339,6 @@ class MrpProduction(models.Model):
                 current_sequence += 1
                 if work.name == '获取CNC加工程序':
                     work.button_start()
-                    work.button_finish()
                     work.fetchCNC()
 
     # 创建工单并进行排序
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 6dd29847..097187ff 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -479,53 +479,38 @@ class ResMrpWorkOrder(models.Model):
                 if self.date_planned_finished and self.date_planned_finished < start_date:
                     vals['date_planned_finished'] = start_date
                 return self.write(vals)
+            # 外协出库单，从“正在等待”变为“就绪”状态
+            if self.is_subcontract is True:
+                picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
+                if picking_out:
+                    picking_out.write({'state': 'assigned'})
         else:
             raise UserError(_('请先完成上一步工单'))
 
     def button_finish(self):
-        end_date = datetime.now()
-        for workorder in self:
-            if workorder.state in ('done', 'cancel'):
-                continue
-            workorder.end_all()
-            vals = {
-                'qty_produced': workorder.qty_produced or workorder.qty_producing or workorder.qty_production,
-                'state': 'done',
-                'date_finished': end_date,
-                'date_planned_finished': end_date,
-                'costs_hour': workorder.workcenter_id.costs_hour
-            }
-            if not workorder.date_start:
-                vals['date_start'] = end_date
-            if not workorder.date_planned_start or end_date < workorder.date_planned_start:
-                vals['date_planned_start'] = end_date
-            workorder.with_context(bypass_duration_calculation=True).write(vals)
-            self.env.cr.commit()
-            finish_workorder_count = self.env['mrp.workorder'].search_count(
-                [('production_id', '=', workorder.production_id.id),
-                 ('is_subcontract', '=', True)])
-            subcontract_workorder_count = self.env['mrp.workorder'].search_count(
-                [('production_id', '=', workorder.production_id.id), ('is_subcontract', '=', True),
-                 ('state', '=', 'done')])
-            if finish_workorder_count > 0 and subcontract_workorder_count > 0:
-                    subcontract_workorder = self.env['mrp.workorder'].search(
-                        [('production_id', '=', workorder.production_id.id), ('is_subcontract', '=', True),
-                         ('state', '=', 'done')])
-                    for item in subcontract_workorder:
-                        order_line_ids = []
-                        server_product = self.env['product.template'].search(
-                            [('server_product_process_parameters_id', '=', item.surface_technics_parameters_id.id),
-                             ('categ_type', '=', '服务'), ('detailed_type', '=', 'service')])
+        if self.picking_out_id:
+            picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
+            if picking_out.workorder_out_id:
+                order_line_ids = []
+                for item in picking_out.workorder_out_id:
+                    server_product = self.env['product.template'].search(
+                        [('server_product_process_parameters_id', '=', item.surface_technics_parameters_id.id),
+                         ('detailed_type', '=', 'service')])
+                    if server_product:
                         order_line_ids.append((0, 0, {
                             'product_id': server_product.product_variant_id.id,
                             'product_qty': 1,
                             'product_uom': server_product.uom_id.id
                         }))
-                        self.env['purchase.order'].create({
-                            'partner_id': server_product.seller_ids.partner_id.id,
-                            'state': 'draft',
-                            'order_line': order_line_ids,
-                        })
+                    else:
+                        raise UserError(
+                            '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
+                self.env['purchase.order'].create({
+                    'partner_id': server_product.seller_ids.partner_id.id,
+                    'state': 'draft',
+                    'order_line': order_line_ids,
+                })
+        super().button_finish()
 
 
 class CNCprocessing(models.Model):
@@ -705,4 +690,4 @@ class SfWorkOrderBarcodes(models.Model):
                 pass
 
         else:
-            self.pro_code_ok = workorder.pro_code_is_ok(barcode)
\ No newline at end of file
+            self.pro_code_ok = workorder.pro_code_is_ok(barcode)
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index dcfcf754..3a79e6f3 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -5,6 +5,7 @@ from re import findall as regex_findall
 from re import split as regex_split
 from odoo import SUPERUSER_ID, _, api, fields, models
 from odoo.tools import float_compare
+import logging
 
 from odoo.exceptions import UserError
 
@@ -238,7 +239,8 @@ class StockPicking(models.Model):
 
     # 设置外协出入单的名称
     def _get_name_Res(self, rescode):
-        count = self.env['ir.sequence'].search_count([('prefix', 'like', rescode)])
+        count = self.env['stock.picking'].search_count([('name', 'like', rescode)])
+        logging.info('count:' + str(count))
         if not count:
             num = "%04d" % 1
         else:
@@ -246,6 +248,21 @@ class StockPicking(models.Model):
             num = "%04d" % m
         return '%s%s' % (rescode, num)
 
+    def button_validate(self):
+        if self.workorder_out_id:
+            workorder_in = self.workorder_out_id.filtered(lambda p: p.state == 'progress' and p.is_subcontract is True)
+            if workorder_in:
+                picking_in = self.env['stock.picking'].search([('id', '=', workorder_in.picking_in_id.id)])
+                if picking_in:
+                    picking_in.write({'state': 'assigned'})
+            else:
+                workorder_subcontract = self.workorder_out_id.filtered(
+                    lambda p: p.state == 'pending' and p.is_subcontract is True)
+                if workorder_subcontract:
+                    raise UserError(_('该出库单对应的工单还未开始，不能进行验证操作！'))
+        res = super().button_validate()
+        return res
+
     # 创建 外协出库入单
     def create_outcontract_picking(self, sorted_workorders_arr, item):
         m = 0
@@ -270,7 +287,7 @@ class StockPicking(models.Model):
                                                         outcontract_picking_type_out))
                     new_picking = True
                     picking_in = self.env['stock.picking'].create(
-                        moves_in._get_new_picking_values_Res(item, sorted_workorders,'WH/OCIN/'))
+                        moves_in._get_new_picking_values_Res(item, sorted_workorders, 'WH/OCIN/'))
                     picking_out = self.env['stock.picking'].create(
                         moves_out._get_new_picking_values_Res(item, sorted_workorders, 'WH/OCOUT/'))
                     moves_in.write({'picking_id': picking_in.id})
@@ -285,6 +302,7 @@ class ReStockMove(models.Model):
     _inherit = 'stock.move'
 
     def _get_new_picking_values_Res(self, item, sorted_workorders, rescode):
+        logging.info('new_picking-rescode: %s' % rescode)
         return {
             'name': self.env['stock.picking']._get_name_Res(rescode),
             'origin': item.name,
@@ -295,5 +313,6 @@ class ReStockMove(models.Model):
             'picking_type_id': self.mapped('picking_type_id').id,
             'location_id': self.mapped('location_id').id,
             'location_dest_id': self.mapped('location_dest_id').id,
-            'state': 'draft',
+            'state': 'confirmed',
         }
+