修复报废向导

sf_manufacturing/controllers/controllers.py

@@ -620,12 +620,12 @@ class Manufacturing_Connect(http.Controller):
                         #                 if is_free is True:
                         #                     delivery_workpiece._delivery_avg()
                         #                     logging.info('agv下发下产线任务下发完成')
-                if ret['IsComplete'] is True:
+                # if ret['IsComplete'] is True:
-                    # 向AGV任务调度下发下产线任务
+                #     # 向AGV任务调度下发下产线任务
-                    workorders = request.env['mrp.workorder'].browse(workorder_ids)
+                #     workorders = request.env['mrp.workorder'].browse(workorder_ids)
-                    request.env['sf.agv.scheduling'].add_scheduling(ret['DeviceId'], '下产线', workorders)
+                #     request.env['sf.agv.scheduling'].add_scheduling(ret['DeviceId'], '下产线', workorders)
-                else:
+                # else:
-                    res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
+                #     res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
         except RepeatTaskException as e:
             logging.info('AGVToProduct error:%s' % e)
         except Exception as e:

sf_manufacturing/models/mrp_production.py

@@ -241,7 +241,10 @@ class MrpProduction(models.Model):
                 res = {'programming_no': programming_no_str}
                 logging.info('res=%s:' % res)
                 configsettings = self.env['res.config.settings'].get_values()
-                config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+                configsettings['token'] = 'ba301c9b-2216-11ef-9d97-f8b54deb92c1'
+                # configsettings['sf_secret_key'] = 'rAalgsVOhDpxIWzR'
+                # configsettings['sf_url'] = 'http://localhost:7069'
+                # config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
                 url = '/api/intelligent_programming/get_state'
                 config_url = configsettings['sf_url'] + url
                 ret = requests.post(config_url, json=res, data=None, headers=config_header)
@@ -808,8 +811,8 @@ class MrpProduction(models.Model):
             'target': 'new',
             'context': {
                 'default_production_id': self.id,
-                'default_programming_state': '编程中' if cloud_programming[
+                'default_reprogramming_num': cloud_programming['reprogramming_num'],
-                                                             'programming_state'] != '已下发' else '已下发',
+                'default_programming_state': cloud_programming['programming_state'],
                 'default_is_reprogramming': True if cloud_programming['programming_state'] in ['已下发'] else False
             }
         }

sf_manufacturing/wizard/production_wizard.py

@@ -13,6 +13,7 @@ class ProductionWizard(models.TransientModel):
     _description = '制造订单向导'
 
     production_id = fields.Many2one('mrp.production', string='制造订单号')
+    reprogramming_num = fields.Integer('重新编程次数', default=0)
     is_reprogramming = fields.Boolean(string='申请重新编程', default=False)
     is_remanufacture = fields.Boolean(string='重新生成制造订单', default=True)
     programming_state = fields.Selection(

sf_manufacturing/wizard/production_wizard_views.xml

@@ -12,6 +12,17 @@
                         重新生成制造订单
                         <field name="is_remanufacture" force_save="1"/>
                     </div>
+                    <div attrs='{"invisible": [("reprogramming_num","=",0)]}'>
+                        注意: 该制造订单产品已申请重新编程次数为<field
+                            name="reprogramming_num" string=""
+                            readonly="1"
+                            style='color:red;'/>,且当前编程状态为
+                        <field name="programming_state" string=""
+                               decoration-info="programming_state == '待编程'"
+                               decoration-success="programming_state == '已下发'"
+                               decoration-warning="programming_state =='编程中'"
+                               decoration-danger="programming_state =='已编程'" readonly="1"/>
+                    </div>
                     <div attrs='{"invisible": [("is_remanufacture","=",False)]}'>
                         <span style='font-weight:bold;'>申请重新编程
                             <field name="is_reprogramming" force_save="1"

sf_sale/models/sale_order.py

@@ -60,7 +60,7 @@ class ReSaleOrder(models.Model):
                           deadline_of_delivery, payments_way, pay_way):
         now_time = datetime.datetime.now()
         partner = self.get_customer()
-        data ={
+        data = {
             'company_id': company_id.id,
             'date_order': now_time,
             'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time),
@@ -79,7 +79,7 @@ class ReSaleOrder(models.Model):
             if not isinstance(deadline_of_delivery, str):
                 data.update({'deadline_of_delivery': deadline_of_delivery})
             else:
-                if deadline_of_delivery!="False":
+                if deadline_of_delivery != "False":
                     data.update({'deadline_of_delivery': deadline_of_delivery})
 
         order_id = self.env['sale.order'].sudo().create(data)
@@ -258,7 +258,7 @@ class RePurchaseOrder(models.Model):
         if is_exist is False:
             purchase_order = self.env['purchase.order'].search(
                 [('state', '=', 'draft'), ('origin', '=', ','.join(production_process))])
-            if not purchase_order:
+            if not purchase_order or len(purchase_order) >= 1:
                 self.env['purchase.order'].sudo().create({
                     'partner_id': server_product.seller_ids.partner_id.id,
                     'origin': ','.join(production_process),