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

注释代码

Browse Source
This commit is contained in:
jinling.yang
2024-07-28 11:47:12 +08:00
parent 36a2bcca6e
commit 39214e5352
4 changed files with 65 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/models/mrp_production.py
View File

@@ -184,8 +184,8 @@ class MrpProduction(models.Model):
production.workorder_ids): production.workorder_ids):
production.state = 'rework' production.state = 'rework'
# 如果制造订单的功能刀具为【无效刀】则制造订单状态改为返工 # 如果制造订单的功能刀具为【无效刀】则制造订单状态改为返工
if production.tool_state == '2': # if production.tool_state == '2':
production.state = 'rework' # production.state = 'rework'
def action_check(self): def action_check(self):
""" """

14
sf_manufacturing/models/mrp_workorder.py
View File

@@ -827,14 +827,18 @@ class ResMrpWorkOrder(models.Model):
('sequence', '=', workorder.sequence - 1), ('sequence', '=', workorder.sequence - 1),
('state', 'in', ['done'])]) ('state', 'in', ['done'])])
if unclamp_workorder: if unclamp_workorder:
workorder.state = 'ready' if workorder.is_subcontract is False:
workorder.state = 'ready'
# else:
# else: # else:
# if workorder.state not in ['cancel', 'rework']: # if workorder.state not in ['cancel', 'rework']:
# workorder.state = 'rework' # workorder.state = 'rework'
if workorder.production_id.state == 'pending_cam': # if workorder.production_id.state == 'pending_cam':
if workorder.routing_type == '装夹预调' and workorder.state in ['ready', 'waiting']: # if workorder.routing_type == '装夹预调' and workorder.state in ['ready', 'waiting']:
if workorder.production_id.tool_state in ['1', '2']: # if workorder.production_id.tool_state in ['1', '2']:
workorder.state = 'waiting' # workorder.state = 'waiting'
logging.info('工序:%s' % workorder.sequence) logging.info('工序:%s' % workorder.sequence)
logging.info('工单最终状态:%s' % workorder.state) logging.info('工单最终状态:%s' % workorder.state)

104
sf_manufacturing/models/stock.py
View File

@@ -272,44 +272,44 @@ class StockRule(models.Model):
product_id_to_production_names[product_id] = [production.name for production in all_production] product_id_to_production_names[product_id] = [production.name for production in all_production]
for production_item in productions: for production_item in productions:
if production_item.product_id.id in product_id_to_production_names: if production_item.product_id.id in product_id_to_production_names:
sorted_process_parameters = sorted(production_item.product_id.model_process_parameters_ids, key=lambda w: w.id) # sorted_process_parameters = sorted(production_item.product_id.model_process_parameters_ids, key=lambda w: w.id)
consecutive_process_parameters = [] # consecutive_process_parameters = []
m = 0 # m = 0
for i in range(len(sorted_workorders) - 1): # for i in range(len(sorted_process_parameters) - 1):
if m == 0: # if m == 0:
is_pick = False # is_pick = False
if sorted_process_parameters[i].supplier_id.id == sorted_process_parameters[i + 1].supplier_id.id : # if sorted_process_parameters[i].supplier_id.id == sorted_process_parameters[i + 1].supplier_id.id and :
if sorted_process_parameters[i] not in consecutive_process_parameters: # if sorted_process_parameters[i] not in consecutive_process_parameters:
consecutive_process_parameters.append(sorted_process_parameters[i]) # consecutive_process_parameters.append(sorted_process_parameters[i])
consecutive_process_parameters.append(sorted_process_parameters[i + 1]) # consecutive_process_parameters.append(sorted_process_parameters[i + 1])
m += 1 # m += 1
continue # continue
else: # else:
if m == len(consecutive_process_parameters) - 1 and m != 0: # if m == len(consecutive_process_parameters) - 1 and m != 0:
self.env['stock.picking'].create_outcontract_picking(consecutive_process_parameters, # self.env['stock.picking'].create_outcontract_picking(consecutive_process_parameters,
production_item) # production_item)
if sorted_process_parameters[i] in consecutive_workorders: # if sorted_process_parameters[i] in consecutive_workorders:
is_pick = True # is_pick = True
consecutive_process_parameters = [] # consecutive_process_parameters = []
m = 0 # m = 0
# 当前面的连续工序生成对应的采购单再生成当前工序的外协采购单 # # 当前面的连续工序生成对应的采购单再生成当前工序的外协采购单
if is_pick is False: # if is_pick is False:
self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i], # self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i],
production_item) # production_item)
if m == len(consecutive_process_parameters) - 1 and m != 0: # if m == len(consecutive_process_parameters) - 1 and m != 0:
self.env['stock.picking'].create_outcontract_picking(consecutive_process_parameters, # self.env['stock.picking'].create_outcontract_picking(consecutive_process_parameters,
production_item) # production_item)
if sorted_process_parameters[i] in consecutive_process_parameters: # if sorted_process_parameters[i] in consecutive_process_parameters:
is_pick = True # is_pick = True
consecutive_process_parameters = [] # consecutive_process_parameters = []
m = 0 # m = 0
if m == len(consecutive_process_parameters) - 1 and m != 0: # if m == len(consecutive_process_parameters) - 1 and m != 0:
self.env['stock.picking'].create_outcontract_picking(consecutive_process_parameters, production_item) # self.env['stock.picking'].create_outcontract_picking(consecutive_process_parameters, production_item)
if is_pick is False and m == 0: # if is_pick is False and m == 0:
if len(sorted_process_parameters) == 1: # if len(sorted_process_parameters) == 1:
self.env['stock.picking'].create_outcontract_picking(sorted_process_parameters, production_item) # self.env['stock.picking'].create_outcontract_picking(sorted_process_parameters, production_item)
else: # else:
self.env['stock.picking'].create_outcontract_picking(sorted_process_parameters[i], production_item) # self.env['stock.picking'].create_outcontract_picking(sorted_process_parameters[i], production_item)
for pp in production_item.product_id.model_process_parameters_ids: for pp in production_item.product_id.model_process_parameters_ids:
if pp.gain_way == '外协': if pp.gain_way == '外协':
server_product = self.env['product.template'].search( server_product = self.env['product.template'].search(
@@ -567,26 +567,26 @@ class StockPicking(models.Model):
[('barcode', 'ilike', 'WH-PREPRODUCTION')]).id), [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
('location_id', '=', self.env['stock.location'].search( ('location_id', '=', self.env['stock.location'].search(
[('barcode', 'ilike', 'VL-SPOC')]).id), [('barcode', 'ilike', 'VL-SPOC')]).id),
('origin', '=', self.origin)]) ('origin', '=', self.origin), ('picking_id', '=', self.id)])
if self.location_id == move_in.location_id and self.location_dest_id == move_in.location_dest_id: if self.location_id == move_in.location_id and self.location_dest_id == move_in.location_dest_id:
if move_out.origin == move_in.origin: if move_out.origin == move_in.origin:
if move_out.picking_id.state != 'done': if move_out.picking_id.state != 'done':
raise UserError( raise UserError(
_('该入库单对应的单号为%s的出库单还未完成，不能进行验证操作！' % move_out.picking_id.name)) _('该入库单对应的单号为%s的出库单还未完成，不能进行验证操作！' % move_out.picking_id.name))
res = super().button_validate() res = super().button_validate()
if res is True: # if res is True:
if self.id == move_out.picking_id.id: # if self.id == move_out.picking_id.id:
# if move_out.move_line_ids.workorder_id.state == 'progress': # # if move_out.move_line_ids.workorder_id.state == 'progress':
move_in = self.env['stock.move'].search( # move_in = self.env['stock.move'].search(
[('location_dest_id', '=', self.env['stock.location'].search( # [('location_dest_id', '=', self.env['stock.location'].search(
[('barcode', 'ilike', 'WH-PREPRODUCTION')]).id), # [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
('location_id', '=', self.env['stock.location'].search( # ('location_id', '=', self.env['stock.location'].search(
[('barcode', 'ilike', 'VL-SPOC')]).id), # [('barcode', 'ilike', 'VL-SPOC')]).id),
('origin', '=', self.origin)]) # ('origin', '=', self.origin)])
production = self.env['mrp.production'].search([('name', '=', self.origin)]) # production = self.env['mrp.production'].search([('name', '=', self.origin)])
if move_in: # if move_in:
move_in.write({'state': 'assigned'}) # move_in.write({'state': 'assigned'})
self.env['stock.move.line'].create(move_in.get_move_line(production, None)) # self.env['stock.move.line'].create(move_in.get_move_line(production, None))
return res return res

4
sf_manufacturing/views/mrp_production_addional_change.xml
View File

@@ -285,7 +285,7 @@
<xpath expr="//sheet//notebook//page[@name='operations']" position="after"> <xpath expr="//sheet//notebook//page[@name='operations']" position="after">
<page string="检测结果" attrs="{'invisible': [('detection_result_ids', '=', [])]}"> <page string="检测结果" attrs="{'invisible': [('detection_result_ids', '=', [])]}">
<field name="detection_result_ids" string="" readonly="1"> <field name="detection_result_ids" string="" readonly="0">
<tree sample="1"> <tree sample="1">
<field name="production_id" invisible="1"/> <field name="production_id" invisible="1"/>
<field name="processing_panel"/> <field name="processing_panel"/>
@@ -566,7 +566,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form> <form>
<group> <group>
<!-- <field name="handle_result"/>--> <field name="handle_result"/>
<field name="test_report" readonly="1" widget="pdf_viewer"/> <field name="test_report" readonly="1" widget="pdf_viewer"/>
</group> </group>
</form> </form>