@@ -59,6 +62,7 @@
+
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 3b2649a2..9e45b879 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -300,29 +300,32 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
智能工厂组装单处扫码绑定刀具物料')
"""
for record in self:
- records = record.env['stock.lot'].search([('name', '=', barcode)])
- if not records:
- raise ValidationError('扫描的条形码数据不存在，请重新扫描！')
- for record_stock_lot in records:
- if record_stock_lot.quant_ids[-1].location_id.name == '刀具组装位置':
- raise ValidationError('该刀具物料已使用，请重新选择！！！')
- elif record_stock_lot.quant_ids[-1].location_id.name not in '刀具房':
- raise ValidationError('该刀具物料未入库，请重新选择！！！')
- tool_material_name = record_stock_lot.product_id.cutting_tool_material_id.name
- if tool_material_name == '整体式刀具':
- record.integral_code_id = record_stock_lot.id
- elif tool_material_name == '刀片':
- record.blade_code_id = record_stock_lot.id
- elif tool_material_name == '刀杆':
- record.bar_code_id = record_stock_lot.id
- elif tool_material_name == '刀盘':
- record.pad_code_id = record_stock_lot.id
- elif tool_material_name == '刀柄':
- record.handle_code_id = record_stock_lot.id
- elif tool_material_name == '夹头':
- record.chuck_code_id = record_stock_lot.id
- else:
- raise ValidationError('扫描的刀具物料不存在，请重新扫描！')
+ if 'DJWL' in barcode:
+ records = record.env['stock.lot'].search([('name', '=', barcode)])
+ if not records:
+ raise ValidationError('扫描的条形码数据不存在，请重新扫描！')
+ for record_stock_lot in records:
+ if record_stock_lot.quant_ids[-1].location_id.name == '刀具组装位置':
+ raise ValidationError('该刀具物料已使用，请重新选择！！！')
+ elif record_stock_lot.quant_ids[-1].location_id.name not in '刀具房':
+ raise ValidationError('该刀具物料未入库，请重新选择！！！')
+ tool_material_name = record_stock_lot.product_id.cutting_tool_material_id.name
+ if tool_material_name == '整体式刀具':
+ record.integral_code_id = record_stock_lot.id
+ elif tool_material_name == '刀片':
+ record.blade_code_id = record_stock_lot.id
+ elif tool_material_name == '刀杆':
+ record.bar_code_id = record_stock_lot.id
+ elif tool_material_name == '刀盘':
+ record.pad_code_id = record_stock_lot.id
+ elif tool_material_name == '刀柄':
+ record.handle_code_id = record_stock_lot.id
+ elif tool_material_name == '夹头':
+ record.chuck_code_id = record_stock_lot.id
+ else:
+ raise ValidationError('扫描的刀具物料不存在，请重新扫描！')
+ else:
+ record.rfid = barcode
# 组装功能刀具参数信息
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号')
@@ -478,9 +481,9 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
product_id = self.env['product.product'].search([('name', '=', '功能刀具')])
# 创建组装入库单
# 创建功能刀具批次/序列号记录
- stock_lot = product_id.create_assemble_warehouse_receipt(self.id, functional_tool_assembly)
+ stock_lot = product_id.create_assemble_warehouse_receipt(self.id, functional_tool_assembly, self)
# 创建刀具组装入库单
- self.env['stock.picking'].create_stocking_picking(stock_lot, functional_tool_assembly)
+ self.env['stock.picking'].create_stocking_picking(stock_lot, functional_tool_assembly, self)
# 刀具物料出库
if self.integral_code_id:
product_id.tool_material_stock_moves(self.integral_code_id)
@@ -580,6 +583,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
return {
'barcode_id': stock_lot.id,
'code': self.tool_code,
+ 'name': self.after_assembly_functional_tool_name,
'rfid': self.rfid,
'tool_groups_id': self.tool_groups_id.id,
'functional_tool_name_id': functional_tool_assembly_id.id,
@@ -615,7 +619,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
class StockPicking(models.Model):
_inherit = 'stock.picking'
- def create_stocking_picking(self, stock_lot, functional_tool_assembly):
+ def create_stocking_picking(self, stock_lot, functional_tool_assembly, obj):
"""
创建刀具组装入库单
"""
@@ -636,7 +640,14 @@ class StockPicking(models.Model):
'location_dest_id': picking_id.location_dest_id.id,
'lot_id': stock_lot.id,
'qty_done': 1,
- 'functional_tool_name_id': functional_tool_assembly.id
+ 'functional_tool_name_id': functional_tool_assembly.id,
+ 'functional_tool_type_id': obj.functional_tool_type_id.id,
+ 'diameter': obj.after_assembly_functional_tool_diameter,
+ 'knife_tip_r_angle': obj.after_assembly_knife_tip_r_angle,
+ 'code': obj.tool_code,
+ 'rfid': obj.rfid,
+ 'functional_tool_name': obj.after_assembly_functional_tool_name,
+ 'tool_groups_id': obj.tool_groups_id.id
})
# 将刀具组装入库单的状态更改为就绪
picking_id.action_confirm()
@@ -661,7 +672,7 @@ class StockPicking(models.Model):
class ProductProduct(models.Model):
_inherit = 'product.product'
- def create_assemble_warehouse_receipt(self, tool_assembly_order_id, functional_tool_assembly):
+ def create_assemble_warehouse_receipt(self, tool_assembly_order_id, functional_tool_assembly, obj):
"""
创建功能刀具批次/序列号记录
"""
@@ -676,7 +687,8 @@ class ProductProduct(models.Model):
location_inventory_id = self.env['stock.location'].search([('name', '=', 'Production')])
stock_location_id = self.env['stock.location'].search([('name', '=', '组装后')])
# 创建功能刀具该批次/序列号 库存移动和移动历史
- stock_lot.create_stock_quant(location_inventory_id, stock_location_id, functional_tool_assembly.id)
+ stock_lot.create_stock_quant(location_inventory_id, stock_location_id, functional_tool_assembly.id,
+ '功能刀具组装', obj)
return stock_lot
@@ -710,20 +722,20 @@ class ProductProduct(models.Model):
location_inventory_id = tool_material.quant_ids.location_id[-1]
stock_location_id = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
# 创建功能刀具该批次/序列号 库存移动和移动历史
- tool_material.create_stock_quant(location_inventory_id, stock_location_id, None)
+ tool_material.create_stock_quant(location_inventory_id, stock_location_id, None, '功能刀具组装', False)
class StockLot(models.Model):
_inherit = 'stock.lot'
- def create_stock_quant(self, location_inventory_id, stock_location_id, functional_tool_assembly_id):
+ def create_stock_quant(self, location_inventory_id, stock_location_id, functional_tool_assembly_id, name, obj):
"""
对功能刀具组装过程的功能刀具和刀具物料进行库存移动，以及创建移动历史
"""
# 创建库存移动记录
- stock_move_id = self.env['stock.move'].create({
- 'name': '功能刀具组装',
+ stock_move_id = self.env['stock.move'].sudo().create({
+ 'name': name,
'product_id': self.product_id.id,
'location_id': location_inventory_id.id,
'location_dest_id': stock_location_id.id,
@@ -732,13 +744,32 @@ class StockLot(models.Model):
})
# 创建移动历史记录
- stock_move_line_id = self.env['stock.move.line'].create({
+ stock_move_line_id = self.env['stock.move.line'].sudo().create({
'product_id': self.product_id.id,
'functional_tool_name_id': functional_tool_assembly_id,
'lot_id': self.id,
'move_id': stock_move_id.id,
'install_tool_time': fields.Datetime.now(),
'qty_done': 1.0,
- 'state': 'done'
+ 'state': 'done',
+ 'functional_tool_type_id': False if not obj else obj.functional_tool_type_id.id,
+ 'diameter': None if not obj else obj.after_assembly_functional_tool_diameter,
+ 'knife_tip_r_angle': None if not obj else obj.after_assembly_knife_tip_r_angle,
+ 'code': '' if not obj else obj.tool_code,
+ 'rfid': '' if not obj else obj.rfid,
+ 'functional_tool_name': '' if not obj else obj.after_assembly_functional_tool_name,
+ 'tool_groups_id': False if not obj else obj.tool_groups_id.id
})
return stock_move_id, stock_move_line_id
+
+
+class StockQuant(models.Model):
+ _inherit = 'stock.quant'
+
+ @api.model_create_multi
+ def create(self, vals_list):
+ records = super(StockQuant, self).create(vals_list)
+ for record in records:
+ if record.lot_id.product_id.categ_id.name == '刀具':
+ record.lot_id.enroll_tool_material_stock()
+ return records
diff --git a/zpl_print/models/common.py b/zpl_print/models/common.py
index 652d02a2..3af9e6c1 100644
--- a/zpl_print/models/common.py
+++ b/zpl_print/models/common.py
@@ -10,6 +10,7 @@ class Common(models.Model):
def print_zpl(self, zpl_str):
# WinDll_path = "D://桌面//pythonZPL//tsc_python_sdk_example//TSC_Python_SDK_Example//tsc_sample//libs//TSCLIB.dll"
WinDll_path = "D://jikimo-dev//jikimo//SF//zpl_print//libs//TSCLIB.dll"
+ # WinDll_path = "D://桌面//pythonZPL//zebra_zpl//libs//TSCLIB.dll"
try:
tsclibrary = ctypes.WinDLL(WinDll_path)
tsclibrary.openportW("USB")