|
|
@@ -391,6 +391,7 @@ class InventoryAccountService
|
|
|
}
|
|
|
public function 盘点生产日期_失效日期_批号有改动任务($id,$count,$inventoryId,$produced_at,$valid_at,$batch_number){
|
|
|
$inventoryAccountMission=InventoryAccountMission::query()->with(['commodity.barcodes','stockInventoryPersons'])->find($id);
|
|
|
+ $inventoryMissionId=null;
|
|
|
if (!$inventoryAccountMission) return null;
|
|
|
$inventory=InventoryAccount::find($inventoryId);
|
|
|
if ($produced_at!=$inventoryAccountMission->produced_at||$valid_at!=$inventoryAccountMission->valid_at ||$batch_number!=$inventoryAccountMission->batch_number){
|
|
|
@@ -429,6 +430,7 @@ class InventoryAccountService
|
|
|
$inventoryMission->returned='否';
|
|
|
}
|
|
|
$inventoryMission->save();
|
|
|
+ $inventoryMissionId=$inventoryMission->id??null;
|
|
|
$inventoryMission->createSignStockInventoryPersons();
|
|
|
|
|
|
}else{
|
|
|
@@ -443,7 +445,7 @@ class InventoryAccountService
|
|
|
'batch_number'=>$batch_number,
|
|
|
];
|
|
|
Controller::logS(__METHOD__,"盘点__".__FUNCTION__,json_encode($request));
|
|
|
- $inventoryAccountMission=InventoryAccountMission::query()->with(['commodity.barcodes','stockInventoryPersons'])->whereIn('id',[$id,$inventoryMission->id])->get();
|
|
|
+ $inventoryAccountMission=InventoryAccountMission::query()->with(['commodity.barcodes','stockInventoryPersons'])->whereIn('id',[$id,$inventoryMissionId])->get();
|
|
|
return $inventoryAccountMission;
|
|
|
}
|
|
|
public function 盘点($inventoryId,$count,$inventoryAccountMission){
|