jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1553: (feature/sale_order_route_pick -> develop)

Browse Source 
Merge Request: 修改排程单bug

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1553?initial=true
This commit is contained in:
胡尧
2024-11-26 11:51:47 +08:00
committed by Coding
parent 429ad2b77c 087bb0e8fe
commit 5ccc836b20
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/models/stock.py
View File

@@ -286,6 +286,8 @@ class StockRule(models.Model):
mrp_production = self.env['mrp.production'].sudo().search([('name', '=', production.origin)], limit=1) mrp_production = self.env['mrp.production'].sudo().search([('name', '=', production.origin)], limit=1)
if mrp_production: if mrp_production:
sale_order = self.env['sale.order'].sudo().search([('name', '=', mrp_production.origin)]) sale_order = self.env['sale.order'].sudo().search([('name', '=', mrp_production.origin)])
else:
mrp_production = production
if sale_order: if sale_order:
# sale_order.write({'schedule_status': 'to schedule'}) # sale_order.write({'schedule_status': 'to schedule'})
self.env['sf.production.plan'].sudo().with_company(company_id).create({ self.env['sf.production.plan'].sudo().with_company(company_id).create({
@@ -293,7 +295,7 @@ class StockRule(models.Model):
'order_deadline': sale_order.deadline_of_delivery, 'order_deadline': sale_order.deadline_of_delivery,
'production_id': production.id, 'production_id': production.id,
'date_planned_start': production.date_planned_start, 'date_planned_start': production.date_planned_start,
'origin': production.origin, 'origin': mrp_production.origin,
'product_qty': production.product_qty, 'product_qty': production.product_qty,
'product_id': production.product_id.id, 'product_id': production.product_id.id,
'state': 'draft', 'state': 'draft',

8
sf_plan/models/custom_plan.py
View File

@@ -259,10 +259,10 @@ class sf_production_plan(models.Model):
# sale_obj = self.env['sale.order'].search([('name', '=', record.origin)]) # sale_obj = self.env['sale.order'].search([('name', '=', record.origin)])
# if 'S' in sale_obj.name: # if 'S' in sale_obj.name:
# sale_obj.schedule_status = 'to process' # sale_obj.schedule_status = 'to process'
mrp_production_ids = record.production_id._get_children().ids # mrp_production_ids = record.production_id._get_children().ids
print('mrp_production_ids', mrp_production_ids) # print('mrp_production_ids', mrp_production_ids)
for i in mrp_production_ids: # for i in mrp_production_ids:
record.env['mrp.production'].sudo().browse(i).schedule_state = '已排' # record.env['mrp.production'].sudo().browse(i).schedule_state = '已排'
# record.production_id.date_planned_start = record.date_planned_start # record.production_id.date_planned_start = record.date_planned_start
# record.production_id.date_planned_finished = record.date_planned_finished # record.production_id.date_planned_finished = record.date_planned_finished
record.sudo().production_id.production_line_id = record.production_line_id.id record.sudo().production_id.production_line_id = record.production_line_id.id