From 404a41294cd16bc17f8e68b4fa2214c360fe3bdf Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 19:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E9=9D=A2=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E5=A4=96=E5=8D=8F=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 2 +-
 sf_manufacturing/models/mrp_workorder.py  | 4 +++-
 sf_manufacturing/models/stock.py          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index afebc618..3a49c2fa 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -657,7 +657,7 @@ class MrpProduction(models.Model):
         for production in self:
             production.write({
                 'date_finished': fields.Datetime.now(),
-                'product_qty': production.qty_produced,
+                'product_qty': production.qty_produced if production.qty_produced < 1 else production.product_qty,
                 'priority': '0',
                 'is_locked': True,
                 'state': 'done',
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index f9e7bd80..ac0ab67a 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -202,6 +202,7 @@ class ResMrpWorkOrder(models.Model):
         [("programming", "编程"), ("clamping", "返工"), ("cutter", "刀具"), ("operate computer", "操机"),
          ("technology", "工艺"), ("customer redrawing", "客户改图"), ("other", "其他"), ], string="原因", tracking=True)
     detailed_reason = fields.Text('详细原因')
+
     # is_send_program_again = fields.Boolean(string='是否重新下发NC程序', default=False)
 
     @api.onchange('rfid_code')
@@ -861,7 +862,7 @@ class ResMrpWorkOrder(models.Model):
                      ('location_dest_id', '=', self.env['stock.location'].search(
                          [('barcode', 'ilike', 'VL-SPOC')]).id),
                      ('origin', '=', self.production_id.name)])
-                purchase = self.env['purchase.order'].search([('origin', '=', self.production_id.name)])
+                purchase = self.env['purchase.order'].search([('origin', 'ilike', self.production_id.name)])
                 if purchase and move_out:
                     move_out.write({'state': 'assigned'})
                     self.env['stock.move.line'].create(move_out.get_move_line(purchase, self))
@@ -1010,6 +1011,7 @@ class ResMrpWorkOrder(models.Model):
                         workorder.rfid_code_old = rfid_code
                         workorder.rfid_code = ''
             if is_production_id is True and record.routing_type in ['解除装夹', '表面工艺']:
+                logging.info('product_qty:%s' % record.production_id.product_qty)
                 for move_raw_id in record.production_id.move_raw_ids:
                     move_raw_id.quantity_done = move_raw_id.product_uom_qty
                 record.process_state = '已完工'
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 2f49344e..9e826fb5 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -211,7 +211,7 @@ class StockRule(models.Model):
             '''
             # productions._create_workorder()
             #
-            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+            self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
             productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
                                            (
                                                    p.move_dest_ids.procure_method != 'make_to_order' and not